updated timeouts for wait method

yongjuntian · Feb 27, 2022 · df8d95a · df8d95a
1 parent fbe9bb9
commit df8d95a
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/pywinauto/base_application.py b/pywinauto/base_application.py
@@ -286,13 +286,16 @@ def wait(self, wait_for, timeout=None, retry_interval=None):
             retry_interval = Timings.window_find_retry
         ctrl = self.find(timeout, retry_interval)
         correct_wait_for = wait_for.lower().split()
+        time_left = timeout
         for condition in correct_wait_for:
+            start = timestamp()
             if condition == 'exists':
-                self.wait_exists(timeout, retry_interval)
+                continue
             elif condition not in WindowSpecification.WAIT_CRITERIA_MAP.keys():
                 raise SyntaxError("Invalid_criteria")
             else:
-                WindowSpecification.WAIT_CRITERIA_MAP[condition](ctrl, timeout, retry_interval)
+                WindowSpecification.WAIT_CRITERIA_MAP[condition](ctrl, time_left, retry_interval)
+            time_left -= timestamp() - start
         return ctrl
 
     def by(self, **criteria):