Playwright implement retry mechanism on 502 and bump to 1.49

playwright_tests/core/utilities.py

@@ -621,14 +621,14 @@ def re_call_function_on_error(self, func, *args, **kwargs):
         for attempt in range(3):
             with warnings.catch_warnings(record=True) as w:
                 warnings.simplefilter("always")
-                func(*args, **kwargs)
+                result = func(*args, **kwargs)
 
                 if (any(issubclass(warning.category, UserWarning) and str(
                         warning.message) == "502 encountered" for warning in w)):
                     print("502 error encountered while executing the function. Retrying...")
                     if attempt < 2:
                         continue
-                break
+                return result
 
     def get_csrfmiddlewaretoken(self) -> str:
         """

playwright_tests/flows/ask_a_question_flows/aaq_flows/aaq_flow.py

@@ -11,17 +11,22 @@ def __init__(self, page: Page):
         self.utilities = Utilities(page)
         self.question_page = QuestionPage(page)
 
+    def submit_an_aaq_question(self, **kwargs):
+        return self.utilities.re_call_function_on_error(
+            lambda: self._submit_an_aaq_question(**kwargs)
+        )
+
     # Submitting an aaq question for a product flow.
     # Mozilla VPN has an extra optional dropdown menu for choosing an operating system.
-    def submit_an_aaq_question(self,
-                               subject: str,
-                               body: str,
-                               topic_name='',
-                               attach_image=False,
-                               is_premium=False,
-                               email="",
-                               is_loginless=False,
-                               expected_locator=None):
+    def _submit_an_aaq_question(self,
+                                subject: str,
+                                body: str,
+                                topic_name='',
+                                attach_image=False,
+                                is_premium=False,
+                                email="",
+                                is_loginless=False,
+                                expected_locator=None):
         question_subject = ''
         if is_premium:
             self.add_valid_data_to_all_premium_products_aaq_fields(subject, body, is_loginless,
@@ -96,10 +101,20 @@ def adding_an_image_to_aaq_form(self):
         )
 
     def deleting_question_flow(self):
+        return self.utilities.re_call_function_on_error(
+            lambda: self._deleting_question_flow()
+        )
+
+    def _deleting_question_flow(self):
         self.question_page.click_delete_this_question_question_tools_option()
         self.question_page.click_delete_this_question_button()
 
-    def editing_question_flow(self, subject='', body='', troubleshoot='', submit_edit=True):
+    def editing_question_flow(self, **kwargs):
+        return self.utilities.re_call_function_on_error(
+            lambda: self._editing_question_flow(**kwargs)
+        )
+
+    def _editing_question_flow(self, subject='', body='', troubleshoot='', submit_edit=True):
         if subject:
             self.aaq_form_page.clear_subject_input_field()
             self.aaq_form_page.add_text_to_aaq_form_subject_field(subject)
@@ -114,7 +129,12 @@ def editing_question_flow(self, subject='', body='', troubleshoot='', submit_edi
         if submit_edit:
             self.aaq_form_page.click_aaq_edit_submit_button()
 
-    def editing_reply_flow(self, reply_body: str, submit_reply=True):
+    def editing_reply_flow(self, **kwargs):
+        return self.utilities.re_call_function_on_error(
+            lambda: self._editing_reply_flow(**kwargs)
+        )
+
+    def _editing_reply_flow(self, reply_body: str, submit_reply=True):
         self.aaq_form_page.clear_the_question_body_textarea_field()
         self.aaq_form_page.add_text_to_aaq_textarea_field(reply_body)
 
@@ -123,7 +143,12 @@ def editing_reply_flow(self, reply_body: str, submit_reply=True):
         else:
             self.aaq_form_page.click_aaq_form_cancel_button()
 
-    def delete_question_reply(self, answer_id: str, delete_reply: bool):
+    def delete_question_reply(self, **kwargs):
+        return self.utilities.re_call_function_on_error(
+            lambda: self._delete_question_reply(**kwargs)
+        )
+
+    def _delete_question_reply(self, answer_id: str, delete_reply: bool):
         self.question_page.click_on_reply_more_options_button(answer_id)
         self.question_page.click_on_delete_this_post_for_a_certain_reply(answer_id)
 
@@ -132,12 +157,17 @@ def delete_question_reply(self, answer_id: str, delete_reply: bool):
         else:
             self.question_page.click_on_cancel_delete_button()
 
-    def post_question_reply_flow(self,
-                                 repliant_username: str,
-                                 reply='',
-                                 submit_reply=True,
-                                 quoted_reply=False,
-                                 reply_for_id='') -> str:
+    def post_question_reply_flow(self, **kwargs):
+        return self.utilities.re_call_function_on_error(
+            lambda: self._post_question_reply_flow(**kwargs)
+        )
+
+    def _post_question_reply_flow(self,
+                                  repliant_username: str,
+                                  reply='',
+                                  submit_reply=True,
+                                  quoted_reply=False,
+                                  reply_for_id='') -> str:
         if quoted_reply:
             self.question_page.click_on_reply_more_options_button(reply_for_id)
             self.question_page.click_on_quote_for_a_certain_reply(reply_for_id)

playwright_tests/flows/explore_articles_flows/article_flows/add_kb_article_flow.py

@@ -31,26 +31,31 @@ def __init__(self, page: Page):
         self.kb_article_review_revision_page = KBArticleReviewRevisionPage(page)
         self.edit_kb_article_page = EditKBArticlePage(page)
 
-    def submit_simple_kb_article(self,
-                                 article_title=None,
-                                 article_slug=None,
-                                 article_category=None,
-                                 article_keyword=None,
-                                 allow_discussion=True,
-                                 allow_translations=True,
-                                 selected_product=True,
-                                 selected_topics=True,
-                                 search_summary=None,
-                                 article_content=None,
-                                 article_content_image='',
-                                 submit_article=True,
-                                 is_template=False,
-                                 expiry_date=None,
-                                 restricted_to_groups: list[str] = None,
-                                 single_group="",
-                                 approve_first_revision=False,
-                                 ready_for_localization=False
-                                 ) -> dict[str, Any]:
+    def submit_simple_kb_article(self, **kwargs):
+        return self.utilities.re_call_function_on_error(
+            lambda: self._submit_simple_kb_article(**kwargs)
+        )
+
+    def _submit_simple_kb_article(self,
+                                  article_title=None,
+                                  article_slug=None,
+                                  article_category=None,
+                                  article_keyword=None,
+                                  allow_discussion=True,
+                                  allow_translations=True,
+                                  selected_product=True,
+                                  selected_topics=True,
+                                  search_summary=None,
+                                  article_content=None,
+                                  article_content_image='',
+                                  submit_article=True,
+                                  is_template=False,
+                                  expiry_date=None,
+                                  restricted_to_groups: list[str] = None,
+                                  single_group="",
+                                  approve_first_revision=False,
+                                  ready_for_localization=False
+                                  ) -> dict[str, Any]:
         self.utilities.navigate_to_link(KBArticlePageMessages.CREATE_NEW_KB_ARTICLE_STAGE_URL)
 
         kb_article_test_data = self.utilities.kb_article_test_data
@@ -194,9 +199,9 @@ def submit_simple_kb_article(self,
         if approve_first_revision:
             self.kb_article_page.click_on_show_history_option()
             if ready_for_localization:
-                self.approve_kb_revision(first_revision_id, ready_for_l10n=True)
+                self.approve_kb_revision(revision_id=first_revision_id, ready_for_l10n=True)
             else:
-                self.approve_kb_revision(first_revision_id)
+                self.approve_kb_revision(revision_id=first_revision_id)
 
         return {"article_title": kb_article_title,
                 "article_content": kb_article_test_data["article_content"],
@@ -214,10 +219,15 @@ def submit_simple_kb_article(self,
                 "first_revision_id": first_revision_id
                 }
 
-    def approve_kb_revision(self, revision_id: str,
-                            revision_needs_change=False,
-                            ready_for_l10n=False,
-                            significance_type=''):
+    def approve_kb_revision(self, **kwargs):
+        return self.utilities.re_call_function_on_error(
+            lambda: self._approve_kb_revision(**kwargs)
+        )
+
+    def _approve_kb_revision(self, revision_id: str,
+                             revision_needs_change=False,
+                             ready_for_l10n=False,
+                             significance_type=''):
         if (KBArticlePageMessages.KB_ARTICLE_HISTORY_URL_ENDPOINT not in
                 self.utilities.get_page_url()):
             self.kb_article_page.click_on_show_history_option()
@@ -247,15 +257,20 @@ def approve_kb_revision(self, revision_id: str,
 
         self.kb_article_review_revision_page.click_accept_revision_accept_button()
 
-    def submit_new_kb_revision(self,
-                               keywords=None,
-                               search_result_summary=None,
-                               content=None,
-                               expiry_date=None,
-                               changes_description=None,
-                               is_admin=False,
-                               approve_revision=False
-                               ) -> dict[str, Any]:
+    def submit_new_kb_revision(self, **kwargs):
+        return self.utilities.re_call_function_on_error(
+            lambda: self._submit_new_kb_revision(**kwargs)
+        )
+
+    def _submit_new_kb_revision(self,
+                                keywords=None,
+                                search_result_summary=None,
+                                content=None,
+                                expiry_date=None,
+                                changes_description=None,
+                                is_admin=False,
+                                approve_revision=False
+                                ) -> dict[str, Any]:
 
         self.kb_article_page.click_on_edit_article_option()
 
@@ -309,7 +324,7 @@ def submit_new_kb_revision(self,
         revision_id = self.kb_article_show_history_page.get_last_revision_id()
 
         if approve_revision:
-            self.approve_kb_revision(revision_id)
+            self.approve_kb_revision(revision_id=revision_id)
 
         revision_time = self.kb_article_show_history_page.get_revision_time(revision_id)
 
@@ -358,7 +373,7 @@ def kb_article_creation_via_api(self, page: Page, approve_revision=False,
 
         first_revision_id = self.kb_article_show_history_page.get_last_revision_id()
         if approve_revision:
-            self.approve_kb_revision(first_revision_id)
+            self.approve_kb_revision(revision_id=first_revision_id)
 
         return {"article_title": kb_title,
                 "article_content": kb_article_test_data["article_content"],

playwright_tests/flows/explore_articles_flows/article_flows/delete_kb_article_flow.py

@@ -1,5 +1,6 @@
 from playwright.sync_api import Page
 
+from playwright_tests.core.utilities import Utilities
 from playwright_tests.pages.explore_help_articles.articles.kb_article_page import KBArticlePage
 from playwright_tests.pages.explore_help_articles.articles.kb_article_show_history_page import \
     KBArticleShowHistoryPage
@@ -10,8 +11,14 @@ class DeleteKbArticleFlow:
     def __init__(self, page: Page):
         self.kb_article_show_history_page = KBArticleShowHistoryPage(page)
         self.kb_article_page = KBArticlePage(page)
+        self.utilities = Utilities(page)
 
     def delete_kb_article(self):
+        return self.utilities.re_call_function_on_error(
+            lambda: self._delete_kb_article()
+        )
+
+    def _delete_kb_article(self):
         # If the delete button is not displayed we presume that we are not on the show history page
         # Clicking on the 'Show History' page.
         if not self.kb_article_show_history_page.is_delete_button_displayed():

playwright_tests/flows/explore_articles_flows/article_flows/edit_article_meta_flow.py

@@ -18,17 +18,22 @@ def __init__(self, page: Page):
         self.submit_kb_article_page = SubmitKBArticlePage(page)
         self.kb_article_page = KBArticlePage(page)
 
-    def edit_article_metadata(self, title=None,
-                              slug=None,
-                              category=None,
-                              product=None,
-                              topics=None,
-                              obsolete=False,
-                              discussions=True,
-                              needs_change=False,
-                              needs_change_comment=False,
-                              restricted_to_groups: list[str] = None,
-                              single_group=""):
+    def edit_article_metadata(self, **kwargs):
+        return self.utilities.re_call_function_on_error(
+            lambda: self._edit_article_metadata(**kwargs)
+        )
+
+    def _edit_article_metadata(self, title=None,
+                               slug=None,
+                               category=None,
+                               product=None,
+                               topics=None,
+                               obsolete=False,
+                               discussions=True,
+                               needs_change=False,
+                               needs_change_comment=False,
+                               restricted_to_groups: list[str] = None,
+                               single_group=""):
 
         if KBArticleRevision.KB_EDIT_METADATA not in self.utilities.get_page_url():
             self.kb_article_page.click_on_edit_article_metadata()
@@ -94,6 +99,11 @@ def edit_article_metadata(self, title=None,
 
         self.kb_article_edit_metadata_page.click_on_save_changes_button()
 
+    def remove_a_restricted_visibility_group(self, **kwargs):
+        return self.utilities.re_call_function_on_error(
+            lambda: self._remove_a_restricted_visibility_group(**kwargs)
+        )
+
     def _remove_a_restricted_visibility_group(self, group_name=''):
         if KBArticleRevision.KB_EDIT_METADATA not in self.utilities.get_page_url():
             self.kb_article_page.click_on_edit_article_metadata()

playwright_tests/flows/explore_articles_flows/article_flows/kb_localization_flow.py

@@ -81,7 +81,7 @@ def _add_article_translation(self, approve_translation_revision: bool, title='',
 
         first_revision_id = self.kb_article_show_history_page.get_last_revision_id()
         if approve_translation_revision:
-            self.approve_kb_translation(first_revision_id)
+            self.approve_kb_translation(revision_id=first_revision_id)
 
         return {
             "translation_title": translation_title,

playwright_tests/pages/ask_a_question/posted_question_pages/questions_page.py

@@ -1,5 +1,7 @@
 from playwright.sync_api import Page, ElementHandle, Locator
 from playwright_tests.core.basepage import BasePage
+from playwright_tests.pages.community_forums.forums_pages.product_support_forum import \
+    ProductSupportForum
 
 
 class QuestionPage(BasePage):
@@ -288,7 +290,8 @@ def click_on_add_a_tag_button(self):
         self._click(self.__add_a_tab_button)
 
     def click_on_a_certain_tag(self, tag_name: str):
-        self._click(f"//li[@class='tag']//a[text()='{tag_name}']")
+        self._click(f"//li[@class='tag']//a[text()='{tag_name}']",
+                    expected_locator=ProductSupportForum.PAGE_LOCATORS["ask_the_community_button"])
 
     def get_a_certain_tag(self, tag_name: str) -> Locator:
         return self._get_element_locator(f"//li[@class='tag']//a[text()='{tag_name}']")