Merge ~barryprice/charm-canonical-livepatch/+git/canonical-livepatch-charm:zazatests into ~livepatch-charmers/charm-canonical-livepatch:master

[Barry Price]

First pass at switching from amulet to tox+zaza for tests. Also dropping official support for Trusty as it's EOL. Oh, and some reformatting via `black`.

3b5ee0d... by Barry Price on 2019-07-06

Obsolete comment removed

4bfc463... by Barry Price on 2019-08-12

Basic tests for an LXD deploy, need to figure out whether/how we can require an OpenStack controller for some test suites

Unmerged commits

4bfc463... by Barry Price on 2019-08-12

Basic tests for an LXD deploy, need to figure out whether/how we can require an OpenStack controller for some test suites

3b5ee0d... by Barry Price on 2019-07-06

Obsolete comment removed

f8061f8... by Barry Price on 2019-07-05

First pass at switching from amulet to tox+zaza for tests. Also dropping official support for Trusty as it's EOL

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..33defe4
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.tox/
diff --git a/Makefile b/Makefile
index e7f78ad..7459cb2 100644
--- a/Makefile
+++ b/Makefile
@@ -5,35 +5,25 @@ all: test
 
 .PHONY: clean
 clean:
-	@rm -f .unit-state.db
 	@find . -name "*.pyc" -type f -exec rm -f '{}' \;
 	@find . -name "__pycache__" -type d -prune -exec rm -rf '{}' \;
 
-.PHONY: testdeps
-testdeps:
-	@sudo apt-get update
-	@sudo apt-get install -y make flake8 python3-flake8 python3-pip python-pip snapd libffi-dev
-	@which juju >/dev/null || (sudo snap install juju --classic)
-	@which charm >/dev/null || (sudo snap install charm --classic)
-	@which bundletester >/dev/null || (pip2 install bundletester juju-deployer)
-	@pip3 install amulet
-
 .PHONY: lint
 lint:
-	@flake8 --max-complexity=16 --max-line-length=120 --exclude=lib/* && echo OK
+	@echo "Normalising python layout with black."
+	@tox -e black
+	@echo "Running flake8"
+	@tox -e lint
 
 .PHONY: charmbuild
 charmbuild:
-	mkdir $(BUILDDEST)
+	mkdir -p $(BUILDDEST)
 	charm build --output-dir $(BUILDDEST) --report
 
-.PHONY: test
-test: check-jujumodel
-	@echo "Running functional tests (including lint and unit tests)..."
-	bundletester -t $(BUILTCHARMDIR) -Fvl DEBUG -e $(JUJU_MODEL)
+.PHONY: smoketest
+smoketest:
+	@tox -e func-smoke
 
-.PHONY: check-jujumodel
-check-jujumodel:
-ifndef JUJU_MODEL
-	$(error JUJU_MODEL is undefined)
-endif
+.PHONY: test
+test:
+	@tox -e func
diff --git a/files/check_canonical-livepatch.py b/files/check_canonical-livepatch.py
index cafd472..0006714 100755
--- a/files/check_canonical-livepatch.py
+++ b/files/check_canonical-livepatch.py
@@ -142,9 +142,7 @@ def is_container():
 def main():
     arch = os.uname()[4]
     if arch not in supported_archs:
-        raise nagios_plugin3.CriticalError(
-            "canonical-livepatch not supported on this architecture ({}).".format(arch)
-        )
+        raise nagios_plugin3.CriticalError("canonical-livepatch not supported on this architecture ({}).".format(arch))
     elif is_container():
         print("canonical-livepatch not needed in OS containers.")
     else:
diff --git a/metadata.yaml b/metadata.yaml
index 6c22c45..e3e557f 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -2,7 +2,7 @@ name: canonical-livepatch
 display-name: Canonical Livepatch
 summary: Ubuntu Linux Livepatching Utility and Daemon
 maintainer: Livepatch charm developers <[e-mail]>
-series: ['bionic', 'xenial', 'trusty']
+series: ['bionic', 'xenial']
 description: |
   This charms installs and configures the Ubuntu Linux Livepatching Utility and Daemon
 tags:
diff --git a/reactive/canonical_livepatch.py b/reactive/canonical_livepatch.py
index f9c1e6e..30692a1 100644
--- a/reactive/canonical_livepatch.py
+++ b/reactive/canonical_livepatch.py
@@ -19,12 +19,7 @@ def file_to_units(local_path, unit_path):
         perms = 0o644
 
     fh = open(local_path, 'r')
-    write_file(
-        path=unit_path,
-        content=fh.read().encode(),
-        owner='root',
-        perms=perms,
-    )
+    write_file(path=unit_path, content=fh.read().encode(), owner='root', perms=perms)
 
 
 def wait_for_path(file_path, timeout=30):
@@ -74,12 +69,7 @@ def write_status_to_disk():
 
     current_status = get_livepatch_status()
     perms = 0o644
-    write_file(
-        path='/var/lib/nagios/canonical-livepatch-status.txt',
-        content=current_status,
-        owner='root',
-        perms=perms,
-    )
+    write_file(path='/var/lib/nagios/canonical-livepatch-status.txt', content=current_status, owner='root', perms=perms)
 
 
 def get_patch_details():
@@ -161,7 +151,7 @@ register_trigger(when='config.changed.livepatch_proxy', clear_flag='livepatch-pr
 @when_not('canonical-livepatch.supported')
 def livepatch_supported():
     arch = uname()[4]
-    supported_archs = ['x86_64', ]
+    supported_archs = ['x86_64']
     if arch not in supported_archs:
         hookenv.log('Livepatch does not currently support {} architecture'.format(arch))
         unit_update('blocked', 'Architecture {} is not supported by livepatch'.format(arch))
@@ -177,7 +167,7 @@ def livepatch_supported():
 def install_livepatch():
     config = hookenv.config()
     snap_channel = config.get('snap_channel')
-    snap.install('canonical-livepatch', **{'channel': snap_channel, })
+    snap.install('canonical-livepatch', **{'channel': snap_channel})
 
 
 @when('snap.installed.canonical-livepatch')
@@ -210,8 +200,8 @@ def proxy_settings():
 @when('livepatch-proxy.configured')
 @when_not('canonical-livepatch.connected')
 def canonical_livepatch_connect():
-    # So if we've just installed snapd on a trusty system, we will not be on
-    # the HWE kernel yet and unfortunately need to reboot first!
+    # So if we've just installed snapd on a trusty system, or are somehow
+    # running an older kernel onto a supported series, we will need to reboot
     current = LooseVersion(uname()[2])
     required = LooseVersion('4.4')
     uptrack_path = '/usr/sbin/uptrack-upgrade'
@@ -250,7 +240,7 @@ def change_channel():
     config = hookenv.config()
     snap_channel = config.get('snap_channel')
     # refresh to the given channel
-    snap.refresh('canonical-livepatch', **{'channel': snap_channel, })
+    snap.refresh('canonical-livepatch', **{'channel': snap_channel})
 
 
 # Set up Nagios checks when the nrpe-external-master subordinate is related
@@ -266,28 +256,20 @@ def configure_nagios(nagios):
     nrpe_setup = nrpe.NRPE(hostname=hostname, primary=False)
 
     # install nagios support files
-    file_to_units(
-        'files/check_canonical-livepatch.cron',
-        '/etc/cron.d/check_canonical-livepatch',
-    )
-    file_to_units(
-        'files/check_canonical-livepatch.py',
-        '/usr/lib/nagios/plugins/check_canonical-livepatch.py',
-    )
+    file_to_units('files/check_canonical-livepatch.cron', '/etc/cron.d/check_canonical-livepatch')
+    file_to_units('files/check_canonical-livepatch.py', '/usr/lib/nagios/plugins/check_canonical-livepatch.py')
 
     # write current status to disk to satisfy the nagios check
     write_status_to_disk()
 
     # remove check from previous release with poorly formed name
-    nrpe_setup.remove_check(
-        shortname='check_canonical-livepatch'
-    )
+    nrpe_setup.remove_check(shortname='check_canonical-livepatch')
 
     # use charmhelpers to create the check
     nrpe_setup.add_check(
         'canonical-livepatch',
         'Verify canonical-livepatch is working',
-        '/usr/lib/nagios/plugins/check_canonical-livepatch.py'
+        '/usr/lib/nagios/plugins/check_canonical-livepatch.py',
     )
 
     nrpe_setup.write()
diff --git a/test-requirements.txt b/test-requirements.txt
new file mode 100644
index 0000000..b7c9112
--- /dev/null
+++ b/test-requirements.txt
@@ -0,0 +1 @@
+git+https://github.com/openstack-charmers/zaza.git#egg=zaza
diff --git a/tests/basic_deployment.py b/tests/basic_deployment.py
new file mode 100644
index 0000000..a07e880
--- /dev/null
+++ b/tests/basic_deployment.py
@@ -0,0 +1,13 @@
+#!/usr/bin/python3
+
+import unittest
+
+import zaza.model as model
+
+
+class BasicDeployment(unittest.TestCase):
+    def test_ubuntu_series(self):
+        first_unit = model.get_units('mongo')[0]
+        result = model.run_on_leader('mongo', 'lsb_release -cs')
+        self.assertEqual(result['Code'], '0')
+        self.assertEqual(result['Stdout'].strip(), first_unit.series)
diff --git a/tests/bundles/bionic.yaml b/tests/bundles/bionic.yaml
new file mode 100644
index 0000000..f95419d
--- /dev/null
+++ b/tests/bundles/bionic.yaml
@@ -0,0 +1,18 @@
+series: bionic
+applications:
+  mongo:
+    charm: cs:mongodb
+    num_units: 1
+  livepatch:
+    charm: ../../../builds/canonical-livepatch
+    series: bionic
+  nrpe:
+    charm: cs:nrpe
+    num_units: 0
+relations:
+  - - mongo
+    - livepatch
+  - - mongo
+    - nrpe:nrpe-external-master
+  - - livepatch
+    - nrpe:nrpe-external-master
diff --git a/tests/bundles/xenial.yaml b/tests/bundles/xenial.yaml
new file mode 100644
index 0000000..5b52957
--- /dev/null
+++ b/tests/bundles/xenial.yaml
@@ -0,0 +1,18 @@
+series: xenial
+applications:
+  mongo:
+    charm: cs:mongodb
+    num_units: 1
+  livepatch:
+    charm: ../../../builds/canonical-livepatch
+    series: xenial
+  nrpe:
+    charm: cs:nrpe
+    num_units: 0
+relations:
+  - - mongo
+    - livepatch
+  - - mongo
+    - nrpe:nrpe-external-master
+  - - livepatch
+    - nrpe:nrpe-external-master
diff --git a/tests/multiseries b/tests/multiseries
deleted file mode 100755
index 55adc62..0000000
--- a/tests/multiseries
+++ /dev/null
@@ -1,159 +0,0 @@
-#!/usr/bin/env python3
-
-import amulet
-import unittest
-from time import sleep
-from yaml import safe_load
-
-
-class TestDeployment(unittest.TestCase):
-    series = 'bionic'  # latest LTS
-
-    @classmethod
-    def setUpClass(cls):
-        cls.deployment = amulet.Deployment(series=cls.series)
-
-        # deploy mongodb as our parent
-        cls.deployment.add('mongodb-{}'.format(cls.series), 'mongodb')
-
-        # deploy our own charm
-        cls.deployment.add('livepatch-{}'.format(cls.series), 'canonical-livepatch')
-
-        # and deploy the nrpe subordinate to test nagios checks
-        cls.deployment.add('nrpe-{}'.format(cls.series), 'nrpe')
-
-        # set nrpe to export its definitions
-        cls.deployment.configure('nrpe-{}'.format(cls.series), {
-            'export_nagios_definitions': True,
-        })
-
-        # relate subordinates to parent charm
-        cls.deployment.relate(
-            'mongodb-{}:juju-info'.format(cls.series),
-            'livepatch-{}:juju-info'.format(cls.series)
-        )
-        cls.deployment.relate(
-            'mongodb-{}:nrpe-external-master'.format(cls.series),
-            'nrpe-{}:nrpe-external-master'.format(cls.series)
-        )
-
-        # relate livepatch to nrpe for its own nagios checks
-        cls.deployment.relate(
-            'livepatch-{}:nrpe-external-master'.format(cls.series),
-            'nrpe-{}:nrpe-external-master'.format(cls.series)
-        )
-
-        try:
-            cls.deployment.setup(timeout=3600)
-            cls.deployment.sentry.wait()
-        except amulet.helpers.TimeoutError:
-            amulet.raise_status(
-                amulet.SKIP,
-                msg="Environment wasn't stood up in time"
-            )
-
-    def test_install(self):
-        livepatch = self.deployment.sentry['livepatch-{}'.format(self.series)][0]
-
-        # verify the snap was installed
-        output, exit_code = livepatch.run(
-            'stat /snap/bin/canonical-livepatch'
-        )
-        self.assertEqual(exit_code, 0)
-
-    def test_status(self):
-        livepatch = self.deployment.sentry['livepatch-{}'.format(self.series)][0]
-
-        # run a status check - we expect this to return 1 due to no access key
-        output, exit_code = livepatch.run('sudo canonical-livepatch status')
-        self.assertEqual(exit_code, 1)
-
-    def test_nagios_init(self):
-        livepatch = self.deployment.sentry['livepatch-{}'.format(self.series)][0]
-
-        # check for nagios bits
-        for path in [
-            '/etc/cron.d/check_canonical-livepatch',
-            '/usr/lib/nagios/plugins/check_canonical-livepatch.py',
-            '/var/lib/nagios/canonical-livepatch-status.txt'
-        ]:
-            output, exit_code = livepatch.run('stat {}'.format(path))
-            self.assertEqual(exit_code, 0)
-
-    def test_nagios_context_change(self):
-        livepatch = self.deployment.sentry['livepatch-{}'.format(self.series)][0]
-
-        test_context_name = 'amulet1'
-
-        # set context name
-        self.deployment.configure('livepatch-{}'.format(self.series), {
-            'nagios_context': test_context_name,
-        })
-
-        # nrpe updates can take a while
-        sleep(30)
-
-        # confirm it showed up in the right place
-        output, exit_code = livepatch.run(
-            'grep {} /var/lib/nagios/export/'
-            'service__*_check_canonical-livepatch'
-            '.cfg'.format(test_context_name))
-        self.assertEqual(exit_code, 0)
-
-    def test_channel_change(self):
-        livepatch = self.deployment.sentry['livepatch-{}'.format(self.series)][0]
-
-        # verify the current channel
-        output, exit_code = livepatch.run('snap info canonical-livepatch')
-        self.assertEqual(exit_code, 0)
-
-        # confirm we're tracking 'stable'
-        output_yaml = safe_load(output)
-        channel = output_yaml['tracking']
-        self.assertEqual(channel, 'stable')
-
-        # change channel to 'beta'
-        self.deployment.configure('livepatch-{}'.format(self.series), {
-            'snap_channel': 'beta',
-        })
-
-        # wait for that to settle
-        sleep(30)
-
-        # verify the current channel
-        output, exit_code = livepatch.run('snap info canonical-livepatch')
-        self.assertEqual(exit_code, 0)
-
-        # confirm we're tracking 'beta'
-        output_yaml = safe_load(output)
-        channel = output_yaml['tracking']
-        self.assertEqual(channel, 'beta')
-
-    def test_nagios_servicegroup_change(self):
-        livepatch = self.deployment.sentry['livepatch-{}'.format(self.series)][0]
-
-        test_servicegroup_name = 'amulet2'
-
-        # set servicegroup name
-        self.deployment.configure('livepatch-{}'.format(self.series), {
-            'nagios_servicegroups': test_servicegroup_name,
-        })
-
-        # nrpe updates can take a while
-        sleep(30)
-
-        # confirm it showed up in the right place
-        output, exit_code = livepatch.run(
-            'grep {} /var/lib/nagios/export/'
-            'service__*_check_canonical-livepatch'
-            '.cfg'.format(test_servicegroup_name)
-        )
-        self.assertEqual(exit_code, 0)
-
-
-class TestXenialDeployment(TestDeployment):
-    series = 'xenial'
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/tests/tests.yaml b/tests/tests.yaml
index 757bcc2..2754f7c 100644
--- a/tests/tests.yaml
+++ b/tests/tests.yaml
@@ -1,2 +1,21 @@
-makefile:
-    - lint
+charm-name: canonical-livepatch
+tests:
+  - zaza.charm_tests.noop.tests.NoopTest
+configure:
+  - zaza.charm_tests.noop.setup.basic_setup
+gate_bundles:
+  - bionic
+smoke_bundles:
+  - bionic
+tests:
+  - tests.basic_deployment.BasicDeployment
+target_deploy_status:
+  mongo:
+    workload-status: active
+    workload-status-message: Unit is ready
+  livepatch:
+    workload-status: blocked
+    workload-status-message: Livepatch is not needed in OS containers
+  nrpe:
+    workload-status: active
+    workload-status-message: ready
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 0000000..4b3e051
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,44 @@
+[tox]
+envlist = pep8
+skipsdist = True
+
+[testenv]
+setenv = VIRTUAL_ENV={envdir}
+         PYTHONHASHSEED=0
+whitelist_externals = juju
+passenv = HOME TERM CS_API_* OS_* AMULET_*
+deps = -r{toxinidir}/test-requirements.txt
+install_command =
+  pip install {opts} {packages}
+
+[testenv:proof]
+basepython = python3
+deps=charm-tools
+commands = charm-proof
+
+[testenv:black]
+commands = black --skip-string-normalization --line-length=120 .
+deps = black
+
+[testenv:lint]
+commands = flake8
+deps = flake8
+
+[testenv:func-noop]
+basepython = python3
+commands =
+    true
+
+[testenv:func]
+basepython = python3
+commands =
+    functest-run-suite --keep-model
+
+[testenv:func-smoke]
+basepython = python3
+commands =
+    functest-run-suite --keep-model --smoke
+
+[testenv:venv]
+commands = {posargs}
+