added timeout, other fixes

Author: sarinali

modules/browser_object_navigation.py

@@ -188,5 +188,6 @@ def open_tracker_panel(self) -> BasePage:
         """
         Clicks the shield icon and opens the panel associated with it
         """
+        self.set_chrome_context()
         self.get_element("shield-icon").click()
         return self

modules/browser_object_tracker_panel.py

@@ -1,5 +1,7 @@
+import logging
 from typing import List
 
+from selenium.common.exceptions import TimeoutException
 from selenium.webdriver.remote.webelement import WebElement
 
 from modules.browser_object_navigation import Navigation
@@ -25,38 +27,46 @@ def wait_for_blocked_tracking_icon(
         first_tracker_website.open()
         tracker_panel.wait_for_blocked_tracking_icon(nav, first_tracker_website)
         """
-        self.driver.set_context(self.driver.CONTEXT_CHROME)
-        try:
-            while 1:
-                nav.get_element("refresh-button").click()
 
-                self.driver.set_context(self.driver.CONTEXT_CONTENT)
+        def shield_active() -> bool:
+            nav.get_element("refresh-button").click()
+            with self.driver.context(self.driver.CONTEXT_CONTENT):
                 page.wait_for_page_to_load()
+            shield_icon = nav.get_element("shield-icon")
+            if (
+                shield_icon.get_attribute("data-l10n-id")
+                == "tracking-protection-icon-active-container"
+            ):
+                return True
+            return False
 
-                self.driver.set_context(self.driver.CONTEXT_CHROME)
-                shield_icon = nav.get_element("shield-icon")
-
-                if (
-                    shield_icon.get_attribute("data-l10n-id")
-                    == "tracking-protection-icon-active-container"
-                ):
-                    return
-        finally:
-            self.driver.set_context(self.driver.CONTEXT_CONTENT)
+        try:
+            with self.driver.context(self.context_id):
+                self.wait.until(lambda _: shield_active())
+        except TimeoutException:
+            logging.warning(
+                "The shield icon was not active after refreshing mulitple times, the test has timed out."
+            )
         return self
 
     def verify_tracker_shield_indicator(self, nav: Navigation) -> BasePage:
-        with self.driver.context(self.driver.CONTEXT_CHROME):
+        """
+        Verifies that the shield icon is
+        """
+        with self.driver.context(self.context_id):
             shield_icon = nav.get_element("shield-icon")
             assert (
                 shield_icon.get_attribute("data-l10n-id")
                 == "tracking-protection-icon-active-container"
-            ), "The label detected did not correspond to the expected one: tracking-protection-icon-no-trackers-detected-container"
+            ), "The label detected did not correspond to the expected one: tracking-protection-icon-active-container"
+        return self
 
     def open_and_return_cross_site_trackers(self) -> List[WebElement]:
-        self.get_element("tracker-cross-site-tracking").click()
-        return self.get_elements("tracking-cross-site-tracking-item")
+        with self.driver.context(self.context_id):
+            self.get_element("tracker-cross-site-tracking").click()
+            return self.get_elements("tracking-cross-site-tracking-item")
 
     def open_and_return_allowed_trackers(self) -> List[WebElement]:
-        self.get_element("tracker-tracking-content").click()
-        return self.get_elements("tracking-allowed-content-item")
+        with self.driver.context(self.context_id):
+            self.get_element("tracker-tracking-content").click()
+            return self.get_elements("tracking-allowed-content-item")

tests/security_and_privacy/test_third_party_content_blocked_private_browsing.py

@@ -98,7 +98,7 @@ def test_third_party_content_blocked_private_browsing_allowed_tracking(driver: F
 
 def test_third_party_content_private_browsing_tracking_statuses(driver: Firefox):
     """
-    C446323.3: Ensure that the statuses of some third party content is loaded properly
+    C446323.3: Ensure that the statuses of some third party content are loaded properly
     """
     # instantiate objects
     panel_ui = PanelUi(driver).open()