Bug 1103956 - Remove explicit type checking from Wait class. r=atolfsen
authorDave Hunt <dhunt@mozilla.com>
Mon, 24 Nov 2014 05:44:00 +0100
changeset 217454 a1dca3cd59b4029751c669d7cf46d7903247e155
parent 217453 2a95a3663cc207b654de0db3656e93200cfeba46
child 217455 f24a2739398dae5f38013f56dee054420ea19950
push id27882
push userryanvm@gmail.com
push dateTue, 25 Nov 2014 21:56:56 +0000
treeherdermozilla-central@ced1402861b8 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersatolfsen
bugs1103956
milestone36.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1103956 - Remove explicit type checking from Wait class. r=atolfsen
testing/marionette/client/marionette/wait.py
--- a/testing/marionette/client/marionette/wait.py
+++ b/testing/marionette/client/marionette/wait.py
@@ -120,17 +120,17 @@ class Wait(object):
         while not until(self.clock, self.end):
             try:
                 rv = condition(self.marionette)
             except (KeyboardInterrupt, SystemExit) as e:
                 raise e
             except self.exceptions as e:
                 last_exc = sys.exc_info()
 
-            if isinstance(rv, bool) and not rv:
+            if not rv:
                 self.clock.sleep(self.interval)
                 continue
 
             if rv is not None:
                 return rv
 
             self.clock.sleep(self.interval)