Merge ~rgildein/juju-verify:ceph-functests-fix into ~canonical-solutions-engineering/juju-verify:master

[Robert Gildein]

logged each verifier result

 * logged each verifier result to get more information
 * fixed typo
 * removed unnecessary code

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

A CI job is currently in progress. A follow up comment will be added when it completes.

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

FAILED: Continuous integration, rev:cebb7768d6d21cbc11b1dea058986d28455e0fff
https://jenkins.canonical.com/bootstack/job/lp-juju-verify-ci/52/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-full/45/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/185/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-juju-verify-ci/52//rebuild

review: Needs Fixing (continuous-integration)

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

A CI job is currently in progress. A follow up comment will be added when it completes.

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

PASSED: Continuous integration, rev:8c273f12bf9806ac711419cbdc4390c50f636cb6
https://jenkins.canonical.com/bootstack/job/lp-juju-verify-ci/53/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/bootstack/job/lp-charm-test-full/46/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/186/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-juju-verify-ci/53//rebuild

review: Approve (continuous-integration)

[Martin Kalcok (martin-kalcok)]

Thanks fro cleaning this up.
+1

review: Approve

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 810ae5127413c9cbfafe81a08f2917a098d0757d

diff --git a/tests/functional/tests/test_ceph.py b/tests/functional/tests/test_ceph.py
index 0e84632..0a772e1 100644
--- a/tests/functional/tests/test_ceph.py
+++ b/tests/functional/tests/test_ceph.py
@@ -1,12 +1,14 @@
 """Test deployment and functionality of juju-verify."""
+import logging
 
 from juju import loop
-import zaza.model
 from tests.base import BaseTestCase
 
 from juju_verify import juju_verify
 from juju_verify.verifiers import get_verifier
 
+logger = logging.getLogger()
+
 
 class CephTests(BaseTestCase):
     """Functional testing for Ceph verifier."""
@@ -24,32 +26,29 @@ class CephTests(BaseTestCase):
         unit_objects = loop.run(juju_verify.find_units(self.model, units))
         verifier = get_verifier(unit_objects)
         result = verifier.verify(check)
-        self.assertTrue(result.success is True)
+        logger.info("result: %s", result)
+        self.assertTrue(result.success)
 
     def test_single_mon_unit(self):
         """Test that shutdown of a single mon unit returns OK."""
         # juju-verify shutdown --units ceph-mon/0
 
         units = ['ceph-mon/0']
-        log_level = 'info'
         check = 'shutdown'
-        juju_verify.config_logger(log_level)
-        model = loop.run(juju_verify.connect_model(zaza.model.CURRENT_MODEL))
-        unit_objects = loop.run(juju_verify.find_units(model, units))
+        unit_objects = loop.run(juju_verify.find_units(self.model, units))
         verifier = get_verifier(unit_objects)
         result = verifier.verify(check)
-        self.assertTrue(result.success is True)
+        logger.info("result: %s", result)
+        self.assertTrue(result.success)
 
     def test_two_mon_unit(self):
         """Test that shutdown of multiple mon units fails."""
         # juju-verify shutdown --units ceph-mon/0 ceph-mon/1
 
         units = ['ceph-mon/0', 'ceph-mon/1']
-        log_level = 'info'
         check = 'shutdown'
-        juju_verify.config_logger(log_level)
-        model = loop.run(juju_verify.connect_model(zaza.model.CURRENT_MODEL))
-        unit_objects = loop.run(juju_verify.find_units(model, units))
+        unit_objects = loop.run(juju_verify.find_units(self.model, units))
         verifier = get_verifier(unit_objects)
         result = verifier.verify(check)
-        self.assertTrue(result.success is False)
+        logger.info("result: %s", result)
+        self.assertFalse(result.success)
diff --git a/tests/functional/tests/test_novacompute.py b/tests/functional/tests/test_novacompute.py
index ca810c8..9c260e9 100644
--- a/tests/functional/tests/test_novacompute.py
+++ b/tests/functional/tests/test_novacompute.py
@@ -39,6 +39,7 @@ class NovaCompute(OpenstackBaseTestCase):
         unit_objects = loop.run(juju_verify.find_units(self.model, units))
         verifier = get_verifier(unit_objects)
         result = verifier.verify(self.CHECK)
+        logger.info("result: %s", result)
         self.assertTrue(result.success)
 
     def test_empty_az_fails(self):
@@ -49,12 +50,12 @@ class NovaCompute(OpenstackBaseTestCase):
         should then trigger empty AZ error.
         """
         nova_application = self.model.applications.get('nova-compute')
-        verfier = get_verifier(nova_application.units)
+        verifier = get_verifier(nova_application.units)
         expected_partial = Partial(Severity.FAIL, "Removing these units would leave "
                                                   "following availability zones empty: "
                                                   "{'nova'}")
-        result = verfier.verify(self.CHECK)
-
+        result = verifier.verify(self.CHECK)
+        logger.info("result: %s", result)
         self.assertFalse(result.success)
         self.assertTrue(expected_partial in result.partials)
 
@@ -83,7 +84,7 @@ class NovaCompute(OpenstackBaseTestCase):
         verifier = get_verifier(target_unit)
 
         result = verifier.verify(self.CHECK)
-
+        logger.info("result: %s", result)
         self.assertFalse(result.success)
         self.assertTrue(expected_partial in result.partials)