From 8ffdd4e7569fe6b8a1c99a44e668838478409d95 Mon Sep 17 00:00:00 2001 From: Kevin W Monroe Date: Wed, 11 Jan 2017 21:28:18 +0000 Subject: [PATCH] fix lint, make xenial the default series --- Makefile | 2 +- metadata.yaml | 2 +- tests/01-deploy.py | 7 ++++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 35de675..f6a8329 100644 --- 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 index 3e9c849..4316d27 100644 --- 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 index 35e8727..d97f348 100755 --- 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()