Merge lp:~harlowja/cloud-init/no-negative-max-wait into lp:~cloud-init-dev/cloud-init/trunk

[Joshua Harlow]

Fix max_wait being showed as < 0

[Server Team CI bot (server-team-bot)]

FAILED: Continuous integration, rev:972
https://server-team-jenkins.canonical.com/job/cloud-init-ci/51/
Executed test runs:
    None: https://server-team-jenkins.canonical.com/job/lp-vote-on-merge/25/console

Click here to trigger a rebuild:
https://server-team-jenkins.canonical.com/job/cloud-init-ci/51/rebuild

review: Needs Fixing (continuous-integration)

[Scott Moser (smoser)]

Hello,
Thank you for taking the time to contribute to cloud-init. Cloud-init has moved its revision control system to git. As a result, we are marking all bzr merge proposals as 'rejected'. If you would like to re-submit this proposal for review, please do so by following the current HACKING documentation at http://cloudinit.readthedocs.io/en/latest/topics/hacking.html .

I think this might be still relevant, so please do re-submit.

Unmerged revisions

972. By Joshua Harlow on 2014-04-09

Fix max_wait being showed as < 0

Ensure that max_wait is always >= 0 so that
when it is displayed it doesn't show up as a
negative number (which is confusing).

=== modified file 'cloudinit/sources/DataSourceOpenStack.py'
--- cloudinit/sources/DataSourceOpenStack.py	2014-02-24 22:41:42 +0000
+++ cloudinit/sources/DataSourceOpenStack.py	2014-04-09 19:31:17 +0000
@@ -58,8 +58,8 @@
         # move it to a shared location instead...
         # Note: the defaults here are different though.
 
-        # max_wait < 0 indicates do not wait
-        max_wait = -1
+        # max_wait <= 0 indicates do not wait
+        max_wait = 0
         timeout = 10
 
         try:

=== modified file 'cloudinit/url_helper.py'
--- cloudinit/url_helper.py	2014-02-13 17:13:42 +0000
+++ cloudinit/url_helper.py	2014-04-09 19:31:17 +0000
@@ -296,9 +296,13 @@
 
     if status_cb is None:
         status_cb = log_status_cb
+    if max_wait is None:
+        max_wait = 0
+    else:
+        max_wait = max(0, max_wait)
 
     def timeup(max_wait, start_time):
-        return ((max_wait <= 0 or max_wait is None) or
+        return ((max_wait == 0) or
                 (time.time() - start_time > max_wait))
 
     loop_n = 0