Merge ~asbalderson/juju-wait:maintain-default-behavior into juju-wait:master

[Alexander Balderson]

Maintain orignal success regardless of machine status

Set the defaults for pending and error timeout to 0, and add
fucntionality so that 0 timeout does not set ready to False.

[Jason Hobbs (jason-hobbs)]

+1. Some background, in our testing, this flagged a failure on a machine that didn't really have any issues other than juju leaving it in 'down' for a while on its way up.

review: Approve

[Stuart Bishop (stub)]

Ta. The new feature should have been backwards compatible to begin with. Bugfix release coming shortly.

review: Approve

diff --git a/juju_wait/__init__.py b/juju_wait/__init__.py
index d40a59b..f88a463 100755
--- a/juju_wait/__init__.py
+++ b/juju_wait/__init__.py
@@ -270,7 +270,7 @@ def wait_cmd(args=sys.argv[1:]):
         dest="machine_error_timeout",
         type=int,
         action="store",
-        default=300,
+        default=0,
         help="Time for a machine to be in a bad state before exiting (seconds).",
     )
     parser.add_argument(
@@ -278,7 +278,7 @@ def wait_cmd(args=sys.argv[1:]):
         dest="machine_pending_timeout",
         type=int,
         action="store",
-        default=3600,
+        default=0,
         help="Time for a machine to be in a pending state before exiting (seconds).",
     )
     parser.add_argument("--version", default=False, action="store_true")
@@ -367,8 +367,8 @@ def wait(
     max_wait=None,
     retry_errors=0,
     exclude=None,
-    machine_error_timeout=300,
-    machine_pending_timeout=3600,
+    machine_error_timeout=0,
+    machine_pending_timeout=0,
     machine_exclude=None,
 ):
     # Note that wait_for_workload is only useful as a workaround for
@@ -586,15 +586,17 @@ def wait(
                 logging.debug("Ignoring machine {} because it is excluded".format(machine))
                 continue
             if state.state in MACHINE_ERROR_STATES:
-                ready = False
                 logging.debug("Machine {} is in {}".format(machine, state.state))
-                if loop_starttime - state.time.timestamp() > machine_error_timeout:
+                if machine_error_timeout > 0:
+                    ready = False
+                if machine_error_timeout > 0 and loop_starttime - state.time.timestamp() > machine_error_timeout:
                     minutes = round((loop_starttime - state.time.timestamp()) / 60)
                     logging.error("Machine {} is in {} for {} minutes.".format(machine, state.state, minutes))
                     raise JujuWaitException(1)
             if state.state in MACHINE_PENDING_STATES:
-                ready = False
-                if loop_starttime - state.time.timestamp() > machine_pending_timeout:
+                if machine_pending_timeout > 0:
+                    ready = False
+                if machine_pending_timeout > 0 and loop_starttime - state.time.timestamp() > machine_pending_timeout:
                     minutes = round((loop_starttime - state.time.timestamp()) / 60)
                     logging.error("Machine {} has been pending for {} minutes".format(machine, minutes))
                     raise JujuWaitException(1)