EES-4117 - slight change to refetching selenium elements behaviour to…

… make it a bit clearer as to why we need to reinitialise the selenium elements prior to each test run

tests/robot-tests/run_tests.py

@@ -16,6 +16,7 @@
 
 import admin_api as admin_api
 import args_and_variables as args_and_variables
+import tests.libs.selenium_elements as selenium_elements
 from pabot.pabot import main_program as pabot_run_cli
 from robot import rebot_cli as robot_rebot_cli
 from robot import run_cli as robot_run_cli
@@ -188,6 +189,11 @@ def run():
         while args.rerun_attempts is None or test_run_index < args.rerun_attempts:
             test_run_index += 1
 
+            # Ensure all SeleniumLibrary elements and keywords are updated to use a branch new
+            # Selenium instance for every test (re)run.
+            if test_run_index > 0:
+                selenium_elements.clear_instances()
+
             rerunning_failed_suites = args.rerun_failed_suites or test_run_index > 0
 
             # Perform any cleanup before the test run.

tests/robot-tests/tests/libs/selenium_elements.py

@@ -1,14 +1,34 @@
 from robot.libraries.BuiltIn import BuiltIn
 from SeleniumLibrary.keywords.waiting import WaitingKeywords
 
+sl_instance = None
+element_finder_instance = None
+waiting_instance = None
+
 
 def sl():
-    return BuiltIn().get_library_instance("SeleniumLibrary")
+    global sl_instance
+    if sl_instance is None:
+        sl_instance = BuiltIn().get_library_instance("SeleniumLibrary")
+    return sl_instance
 
 
 def element_finder():
-    return sl()._element_finder
+    global element_finder_instance
+    if element_finder_instance is None:
+        element_finder_instance = sl()._element_finder
+    return element_finder_instance
 
 
 def waiting():
-    return WaitingKeywords(sl())
+    global waiting_instance
+    if waiting_instance is None:
+        waiting_instance = WaitingKeywords(sl())
+    return waiting_instance
+
+
+def clear_instances():
+    global sl_instance, element_finder_instance, waiting_instance
+    sl_instance = None
+    element_finder_instance = None
+    waiting_instance = None