launchpad-reviewers team mailing list archive

[Colin Watson <cjwatson@xxxxxxxxxxxxx>]

Colin Watson has proposed merging lp:~cjwatson/canonical-mojo-specs/snap-proxy-juju-check-wait into lp:~canonical-launchpad-branches/canonical-mojo-specs/trunk.

Commit message:
snap-proxy: Migrate to juju-check-wait

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/canonical-mojo-specs/snap-proxy-juju-check-wait/+merge/389481

check-juju doesn't work following the Mojo Python 3 port.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~cjwatson/canonical-mojo-specs/snap-proxy-juju-check-wait into lp:~canonical-launchpad-branches/canonical-mojo-specs/trunk.

=== removed symlink 'lp/mojo-lp-snap-proxy/check-juju'
=== target was '../../scripts/tests/check-juju'
=== modified file 'lp/mojo-lp-snap-proxy/manifests/verify'
--- lp/mojo-lp-snap-proxy/manifests/verify	2015-11-15 20:52:57 +0000
+++ lp/mojo-lp-snap-proxy/manifests/verify	2020-08-18 14:51:58 +0000
@@ -1,4 +1,4 @@
-script config=check-juju
+juju-check-wait
 # It occasionally takes a little while for all the servers to start
 # accepting connections.
 verify retry=2

=== modified file 'lp/mojo-lp-snap-proxy/update-code-asset'
--- lp/mojo-lp-snap-proxy/update-code-asset	2016-05-16 11:01:39 +0000
+++ lp/mojo-lp-snap-proxy/update-code-asset	2020-08-18 14:51:58 +0000
@@ -14,14 +14,16 @@
     current_dir = os.path.dirname(__file__)
     try:
         sys.stdout.write(
-            "Running check-juju at {}\n".format(datetime.utcnow()))
-        subprocess.check_call(['./check-juju'], cwd=current_dir)
+            "Running mojo juju-check-wait at {}\n".format(datetime.utcnow()))
+        subprocess.check_call(['mojo', 'juju-check-wait'], cwd=current_dir)
     except subprocess.CalledProcessError as e:
-        sys.stdout.write("check-juju failed at {}:\n{}\n".format(
-            datetime.utcnow(), e))
+        sys.stdout.write(
+            "mojo juju-check-wait failed at {}:\n{}\n".format(
+                datetime.utcnow(), e))
     else:
-        sys.stdout.write("check-juju completed successfully at {}\n".format(
-            datetime.utcnow()))
+        sys.stdout.write(
+            "mojo juju-check-wait completed successfully at {}\n".format(
+                datetime.utcnow()))
 
 
 container_name = os.environ.get(