fix lint, make xenial the default series

juju-solutions · Jan 11, 2017 · 8ffdd4e · 8ffdd4e
1 parent 9e44e81
commit 8ffdd4e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -4,5 +4,5 @@ PYTHON := /usr/bin/env python
 all: lint
 
 lint:
-	@flake8 --exclude hooks/charmhelpers hooks tests
+	@flake8 --exclude=hooks/charmhelpers,hooks/relations hooks tests
 	@charm proof
diff --git a/metadata.yaml b/metadata.yaml
@@ -8,8 +8,8 @@ description: |
   like 'openjdk' and 'ibm-xlc'.
 tags: [application_development]
 series:
-  - trusty
   - xenial
+  - trusty
 provides:
   xlc:
     interface: xlc-compiler

diff --git a/tests/01-deploy.py b/tests/01-deploy.py
@@ -15,9 +15,9 @@ class TestDeploy(unittest.TestCase):
 
     @classmethod
     def setUpClass(cls):
-        cls.d = amulet.Deployment(series='trusty')
-        cls.d.add('ubuntu-devenv', 'cs:trusty/ubuntu-devenv')
-        cls.d.add('openjdk', 'cs:trusty/openjdk')
+        cls.d = amulet.Deployment(series='xenial')
+        cls.d.add('ubuntu-devenv', 'cs:xenial/ubuntu-devenv')
+        cls.d.add('openjdk', 'cs:xenial/openjdk')
         cls.d.relate('ubuntu-devenv:java', 'openjdk:java')
         cls.d.setup(timeout=900)
         cls.d.sentry.wait(timeout=1800)
@@ -39,5 +39,6 @@ def test_java(self):
         print("output from cmd: {}".format(output))
         assert rc == 0, "Unexpected return code: {}".format(rc)
 
+
 if __name__ == '__main__':
     unittest.main()