Merge lp:~mthaddon/juju-deployer/fix-test-failures into lp:juju-deployer

[Tom Haddon]

Fix test failures

Fix test failures.

Without this update we're seeing test failures on focal (where bzr is brz). Also seeing failures in juju 1 deployments as below.

Traceback (most recent call last):
  File "/usr/bin/juju-deployer", line 9, in <module>
    load_entry_point('juju-deployer==0.11.0', 'console_scripts', 'juju-deployer')()
  File "/usr/lib/python3/dist-packages/deployer/cli.py", line 140, in main
    run()
  File "/usr/lib/python3/dist-packages/deployer/cli.py", line 250, in run
    importer.Importer(env, deployment, options).run()
  File "/usr/lib/python3/dist-packages/deployer/action/importer.py", line 307, in run
    self.wait_for_units(ignore_errors=ignore_errors)
  File "/usr/lib/python3/dist-packages/deployer/action/importer.py", line 278, in wait_for_units
    services=self.deployment.get_service_names(), on_errors=on_errors)
  File "/usr/lib/python3/dist-packages/deployer/env/go.py", line 279, in wait_for_units
    services=services, on_errors=on_errors).run(callback)
  File "/usr/lib/python3/dist-packages/jujuclient/watch.py", line 167, in run
    if self.complete() is True:
  File "/usr/lib/python3/dist-packages/deployer/env/watchers.py", line 114, in complete
    message != "running update-status hook":

[Barry Price (barryprice)]

LGTM +1

review: Approve

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

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

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

Change successfully merged at revision 217

=== modified file 'deployer/env/watchers.py'
--- deployer/env/watchers.py	2018-04-17 14:17:12 +0000
+++ deployer/env/watchers.py	2020-10-06 16:00:44 +0000
@@ -95,6 +95,9 @@
         units_in_error = self.units_in_error
         for unit_name, data in self.units.items():
             try:
+                # Ensure message is set for each loop as we may test for it
+                # lower down if we're not in err_status == 'Error'.
+                message = None
                 err_status = data['Status']
                 goal_status = err_status
             except KeyError:
 
=== modified file 'deployer/tests/test_charm.py'
--- deployer/tests/test_charm.py	2016-12-22 22:52:22 +0000
+++ deployer/tests/test_charm.py	2020-10-06 16:00:44 +0000
@@ -192,7 +192,7 @@
         charm = Charm.from_service(
             "scratch", self.repo_path, "precise", params)
         self.assertRaises(ErrorExit, charm.fetch)
-        self.assertIn('bzr: ERROR: Not a branch: ', self.output.getvalue())
+        self.assertIn('ERROR: Not a branch: ', self.output.getvalue())
 
 
 class Git(BaseGit):