Mojo: Continuous Delivery for Juju

Merge lp:~gnuoy/mojo/py3-wait-explicit-float into lp:~ost-maintainers/mojo/py3

  1. py3-wait-explicit-float
  2. Merge into py3
Proposed by Liam Young
Status: Merged
Merged at revision: 468
Proposed branch: lp:~gnuoy/mojo/py3-wait-explicit-float
Merge into: lp:~ost-maintainers/mojo/py3
Diff against target: 12 lines (+1/-1)
1 file modified
mojo/juju/wait.py (+1/-1)
To merge this branch: bzr merge lp:~gnuoy/mojo/py3-wait-explicit-float
Reviewer Review Type Date Requested Status
Chris MacNaughton (community) Approve
Review via email: mp+336783@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Chris MacNaughton (chris.macnaughton) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'mojo/juju/wait.py'
2--- mojo/juju/wait.py 2018-01-29 12:15:11 +0000
3+++ mojo/juju/wait.py 2018-01-29 15:25:53 +0000
4@@ -266,7 +266,7 @@
5
6 # If defined, fail if max_wait is exceeded
7 epoch_elapsed = time.time() - epoch_started
8- if max_wait and epoch_elapsed > max_wait:
9+ if max_wait and epoch_elapsed > float(max_wait):
10 ready = False
11 logging.error('Not ready in {}s (max_wait)'.format(max_wait))
12 raise JujuWaitException(44)

Subscribers

People subscribed via source and target branches