change assertion polling

Author: mkorpela

Browser/assertion_engine.py

@@ -67,19 +67,19 @@ def verify_assertion(
 
 
 @wrapt.decorator
-def with_assertions(wrapped, instance, args, kwargs):
+def with_assertion_polling(wrapped, instance, args, kwargs):
     start = time.time()
-    err: Optional[AssertionError] = None
     timeout = timestr_to_secs(instance.timeout)
-    while time.time() - start < timeout:
+    while True:
         try:
             return wrapped(*args, **kwargs)
         except AssertionError as e:
-            err = e
-            if timeout - (time.time() - start) > 0.1:
-                logger.debug("Verification failure - retrying")
-                time.sleep(0.1)
-    raise err
+            elapsed = time.time() - start
+            if elapsed > timeout:
+                raise e
+            logger.debug("Verification failure - retrying")
+            if timeout - elapsed > 0.016:
+                time.sleep(0.016)  # 60 fps
 
 
 def int_str_verify_assertion(

Browser/keywords/getters.py

@@ -10,7 +10,7 @@
     int_str_verify_assertion,
     list_verify_assertion,
     verify_assertion,
-    with_assertions,
+    with_assertion_polling,
 )
 from ..base import LibraryComponent
 from ..generated.playwright_pb2 import Request
@@ -20,7 +20,7 @@
 
 class Getters(LibraryComponent):
     @keyword(tags=["Getter", "Assertion", "BrowserControl"])
-    @with_assertions
+    @with_assertion_polling
     def get_url(
         self,
         assertion_operator: Optional[AssertionOperator] = None,
@@ -41,7 +41,7 @@ def get_url(
             )
 
     @keyword(tags=["Getter", "Assertion", "BrowserControl"])
-    @with_assertions
+    @with_assertion_polling
     def get_page_state(
         self,
         assertion_operator: Optional[AssertionOperator] = None,
@@ -68,7 +68,7 @@ def get_page_state(
             )
 
     @keyword(tags=["Getter", "Assertion", "BrowserControl"])
-    @with_assertions
+    @with_assertion_polling
     def get_page_source(
         self,
         assertion_operator: Optional[AssertionOperator] = None,
@@ -89,7 +89,7 @@ def get_page_source(
             )
 
     @keyword(tags=["Getter", "Assertion", "PageContent"])
-    @with_assertions
+    @with_assertion_polling
     def get_title(
         self,
         assertion_operator: Optional[AssertionOperator] = None,
@@ -110,7 +110,7 @@ def get_title(
             )
 
     @keyword(tags=["Getter", "Assertion", "PageContent"])
-    @with_assertions
+    @with_assertion_polling
     def get_text(
         self,
         selector: str,
@@ -134,7 +134,7 @@ def get_text(
             )
 
     @keyword(tags=["Getter", "Assertion", "PageContent"])
-    @with_assertions
+    @with_assertion_polling
     def get_attribute(
         self,
         selector: str,
@@ -183,7 +183,7 @@ def get_textfield_value(
         )
 
     @keyword(tags=["Getter", "Assertion", "PageContent"])
-    @with_assertions
+    @with_assertion_polling
     def get_selected_options(
         self,
         selector: str,
@@ -240,7 +240,7 @@ def get_selected_options(
             )
 
     @keyword(tags=["Getter", "Assertion", "PageContent"])
-    @with_assertions
+    @with_assertion_polling
     def get_checkbox_state(
         self,
         selector: str,
@@ -280,7 +280,7 @@ def get_checkbox_state(
         )
 
     @keyword(tags=["Getter", "Assertion", "PageContent"])
-    @with_assertions
+    @with_assertion_polling
     def get_element_count(
         self,
         selector: str,
@@ -358,7 +358,7 @@ def get_browser_catalog(self):
             return parsed
 
     @keyword(tags=["Getter", "Assertion", "BrowserControl"])
-    @with_assertions
+    @with_assertion_polling
     def get_viewport_size(
         self,
         assertion_operator: Optional[AssertionOperator] = None,
@@ -404,7 +404,7 @@ def get_elements(self, selector: str):
             return data
 
     @keyword(tags=["Getter", "Assertion"])
-    @with_assertions
+    @with_assertion_polling
     def get_style(
         self,
         selector: str,

Browser/keywords/webapp_state.py

@@ -3,7 +3,7 @@
 
 from robotlibcore import keyword  # type: ignore
 
-from ..assertion_engine import verify_assertion, with_assertions
+from ..assertion_engine import verify_assertion, with_assertion_polling
 from ..base import LibraryComponent
 from ..generated.playwright_pb2 import Request
 from ..utils import logger
@@ -12,7 +12,7 @@
 
 class WebAppState(LibraryComponent):
     @keyword(name="localStorage get Item", tags=["WebAppState", "Assertion", "Getter"])
-    @with_assertions
+    @with_assertion_polling
     def local_storage_get_item(
         self,
         key: str,
@@ -84,7 +84,7 @@ def local_storage_clear(self):
     @keyword(
         name="sessionStorage get Item", tags=["WebAppState", "Assertion", "Getter"]
     )
-    @with_assertions
+    @with_assertion_polling
     def session_storage_get_item(
         self,
         key: str,

utest/test_assertion_engine.py

@@ -1,5 +1,5 @@
 import pytest
-from Browser.assertion_engine import verify_assertion, AssertionOperator, with_assertions
+from Browser.assertion_engine import verify_assertion, AssertionOperator, with_assertion_polling
 from robot.libraries.BuiltIn import EXECUTION_CONTEXTS  # type: ignore
 
 
@@ -26,11 +26,11 @@ class FakeBrowser:
     timeout = "0.3s"
     counter = 1
 
-    @with_assertions
+    @with_assertion_polling
     def is_three(self, value):
         verify_assertion(value, AssertionOperator['=='], 3)
 
-    @with_assertions
+    @with_assertion_polling
     def second_run_success(self):
         current = self.counter
         self.counter += 1