DanielWagnerHall: Always try to evaluate a wait at least once

r15891

py/selenium/webdriver/support/wait.py

@@ -44,26 +44,30 @@ def until(self, method):
         """Calls the method provided with the driver as an argument until the \
         return value is not False."""
         end_time = time.time() + self._timeout
-        while(time.time() < end_time):
+        while(True):
             try:
                 value = method(self._driver)
                 if value:
                     return value
             except NoSuchElementException:
                 pass
             time.sleep(self._poll)
+            if(time.time() > end_time):
+                break
         raise TimeoutException()
 
     def until_not(self, method):
           """Calls the method provided with the driver as an argument until the \
           return value is False."""
           end_time = time.time() + self._timeout
-          while(time.time() < end_time):
+          while(True):
               try:
                   value = method(self._driver)
                   if value:
                       pass
               except NoSuchElementException:
                   return True
               time.sleep(self._poll)
-          raise TimeoutException()
+              if(time.time() > end_time):
+                  break
+          raise TimeoutException()

py/test/selenium/webdriver/support/webdriverwait_tests.py

@@ -96,6 +96,12 @@ def testShouldWaitOnlyAsLongAsTimeoutSpecifiedWhenImplicitWaitsAreSet(self):
         finally:
             self.driver.implicitly_wait(0)
 
+    def testShouldWaitAtLeastOnce(self):
+        self._loadPage("simpleTest")
+        elements_exists = lambda driver: driver.find_elements_by_tag_name('h1')
+        elements = WebDriverWait(self.driver, 0).until(elements_exists)
+        self.assertTrue(len(elements) >= 1)
+
     def _pageURL(self, name):
         return "http://localhost:%d/%s.html" % (self.webserver.port, name)