From f539e8c33147df10fc5d853af041367a784f76fb Mon Sep 17 00:00:00 2001 From: Shveta Sachdeva Date: Tue, 20 Oct 2020 15:35:19 -0700 Subject: [PATCH 01/15] Fixing jenkins failures --- mta/entities/projects.py | 3 ++- mta/widgetastic/__init__.py | 5 +---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/mta/entities/projects.py b/mta/entities/projects.py index 0384196..f2bbe87 100644 --- a/mta/entities/projects.py +++ b/mta/entities/projects.py @@ -87,6 +87,7 @@ class configure_analysis(View): # noqa locator=".//wu-select-packages/h3[normalize-space(.)='Application packages']" ) save_and_run = Button("Save & Run") + yes_button = Button("Yes") fill_strategy = WaitFillViewStrategy("15s") @property @@ -165,13 +166,13 @@ def fill(self, values): """ if values.get("transformation_path"): self.transformation_path.select_card(card_name=values.get("transformation_path")) - wait_for(lambda: self.application_packages.is_displayed, delay=0.6, timeout=240) was_change = True self.after_fill(was_change) return was_change def after_fill(self, was_change): self.save_and_run.click() + self.yes_button.click() @property def is_displayed(self): diff --git a/mta/widgetastic/__init__.py b/mta/widgetastic/__init__.py index 93ab124..9878dbc 100644 --- a/mta/widgetastic/__init__.py +++ b/mta/widgetastic/__init__.py @@ -212,10 +212,7 @@ def select_project(self, name): class AnalysisResults(Widget): # When there are multiple analysis the first row is latest one # so we need to check spinner and success in 1st row - SPINNER_LOCATOR = ( - './/tr[contains(@class, "info")]/td[2]/wu-status-icon' - '/span[contains(@class, "status-icon")]/span[contains(@class,"spinner")]' - ) + SPINNER_LOCATOR = ".//div[contains(@class ,'spinner spinner-xs')]" COMPLETE_STATUS_LOCATOR = ( './/tr[1]/td[2]//wu-status-icon/span/span[contains(@class, "fa fa-check")]' ) From 024eb9539a3bcc118d82e59e00fd4b15bf7da7fe Mon Sep 17 00:00:00 2001 From: Shveta Sachdeva Date: Tue, 20 Oct 2020 18:58:55 -0700 Subject: [PATCH 02/15] Fixing jenkins failures --- mta/tests/test_advanced_options_Test06.py | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/mta/tests/test_advanced_options_Test06.py b/mta/tests/test_advanced_options_Test06.py index e9886a9..1a21ba0 100644 --- a/mta/tests/test_advanced_options_Test06.py +++ b/mta/tests/test_advanced_options_Test06.py @@ -64,18 +64,9 @@ def test_advanced_options(application): fs1 = FTPClientWrapper(env.ftpserver.entities.mta) file_path = fs1.download("custom.Test1rules.rhamt.xml") view.configure_analysis.use_custom_rules.upload_file.fill(file_path) - view.configure_analysis.use_custom_rules.add_rules_button.wait_displayed() - wait_for( - lambda: view.configure_analysis.use_custom_rules.add_rules_button.is_enabled, - delay=0.2, - timeout=60, - ) + view.configure_analysis.use_custom_rules.add_rules_button.wait_displayed('10s') view.configure_analysis.use_custom_rules.add_rules_button.click() - wait_for( - lambda: view.configure_analysis.use_custom_rules.select_all_rules.is_enabled, - delay=0.2, - timeout=60, - ) + view.configure_analysis.use_custom_rules.select_all_rules.wait_displayed('10s') view.configure_analysis.use_custom_rules.select_all_rules.click() assert view.configure_analysis.use_custom_rules.rule.is_displayed view.configure_analysis.use_custom_rules.expand_custom_rules.click() @@ -89,11 +80,6 @@ def test_advanced_options(application): file_path = fs2.download("customWebLogic.windup.label.xml") view.configure_analysis.use_custom_labels.upload_file.fill(file_path) view.configure_analysis.use_custom_labels.add_labels_button.wait_displayed() - wait_for( - lambda: view.configure_analysis.use_custom_labels.add_labels_button.is_enabled, - delay=0.2, - timeout=60, - ) view.configure_analysis.use_custom_labels.add_labels_button.click() view.configure_analysis.use_custom_labels.select_all_labels.click() assert view.configure_analysis.use_custom_labels.label.is_displayed From 55c884a7e405a2de8d405b6f7eed28836758f428 Mon Sep 17 00:00:00 2001 From: Shveta Sachdeva Date: Tue, 20 Oct 2020 19:47:44 -0700 Subject: [PATCH 03/15] Fixing jenkins failures --- mta/tests/test_advanced_options_Test06.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mta/tests/test_advanced_options_Test06.py b/mta/tests/test_advanced_options_Test06.py index 1a21ba0..24f9943 100644 --- a/mta/tests/test_advanced_options_Test06.py +++ b/mta/tests/test_advanced_options_Test06.py @@ -64,9 +64,9 @@ def test_advanced_options(application): fs1 = FTPClientWrapper(env.ftpserver.entities.mta) file_path = fs1.download("custom.Test1rules.rhamt.xml") view.configure_analysis.use_custom_rules.upload_file.fill(file_path) - view.configure_analysis.use_custom_rules.add_rules_button.wait_displayed('10s') + view.configure_analysis.use_custom_rules.add_rules_button.wait_displayed("10s") view.configure_analysis.use_custom_rules.add_rules_button.click() - view.configure_analysis.use_custom_rules.select_all_rules.wait_displayed('10s') + view.configure_analysis.use_custom_rules.select_all_rules.wait_displayed("10s") view.configure_analysis.use_custom_rules.select_all_rules.click() assert view.configure_analysis.use_custom_rules.rule.is_displayed view.configure_analysis.use_custom_rules.expand_custom_rules.click() @@ -81,6 +81,7 @@ def test_advanced_options(application): view.configure_analysis.use_custom_labels.upload_file.fill(file_path) view.configure_analysis.use_custom_labels.add_labels_button.wait_displayed() view.configure_analysis.use_custom_labels.add_labels_button.click() + view.configure_analysis.use_custom_labels.select_all_labels.wait_displayed("10s") view.configure_analysis.use_custom_labels.select_all_labels.click() assert view.configure_analysis.use_custom_labels.label.is_displayed view.configure_analysis.use_custom_labels.expand_custom_labels.click() From 206846f432e163ef40041a5271dbadfdac21911b Mon Sep 17 00:00:00 2001 From: Shveta Sachdeva Date: Tue, 20 Oct 2020 20:25:38 -0700 Subject: [PATCH 04/15] Fixing jenkins failures --- mta/tests/test_advanced_options_Test06.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mta/tests/test_advanced_options_Test06.py b/mta/tests/test_advanced_options_Test06.py index 24f9943..406c289 100644 --- a/mta/tests/test_advanced_options_Test06.py +++ b/mta/tests/test_advanced_options_Test06.py @@ -64,9 +64,9 @@ def test_advanced_options(application): fs1 = FTPClientWrapper(env.ftpserver.entities.mta) file_path = fs1.download("custom.Test1rules.rhamt.xml") view.configure_analysis.use_custom_rules.upload_file.fill(file_path) - view.configure_analysis.use_custom_rules.add_rules_button.wait_displayed("10s") + view.configure_analysis.use_custom_rules.add_rules_button.wait_displayed("30s") view.configure_analysis.use_custom_rules.add_rules_button.click() - view.configure_analysis.use_custom_rules.select_all_rules.wait_displayed("10s") + view.configure_analysis.use_custom_rules.select_all_rules.wait_displayed("30s") view.configure_analysis.use_custom_rules.select_all_rules.click() assert view.configure_analysis.use_custom_rules.rule.is_displayed view.configure_analysis.use_custom_rules.expand_custom_rules.click() @@ -81,7 +81,7 @@ def test_advanced_options(application): view.configure_analysis.use_custom_labels.upload_file.fill(file_path) view.configure_analysis.use_custom_labels.add_labels_button.wait_displayed() view.configure_analysis.use_custom_labels.add_labels_button.click() - view.configure_analysis.use_custom_labels.select_all_labels.wait_displayed("10s") + view.configure_analysis.use_custom_labels.select_all_labels.wait_displayed("30s") view.configure_analysis.use_custom_labels.select_all_labels.click() assert view.configure_analysis.use_custom_labels.label.is_displayed view.configure_analysis.use_custom_labels.expand_custom_labels.click() From 035663752ffd8efdc5cf5320146e2737fc44b847 Mon Sep 17 00:00:00 2001 From: Shveta Sachdeva Date: Tue, 20 Oct 2020 21:03:05 -0700 Subject: [PATCH 05/15] Fixing jenkins failures --- mta/tests/test_advanced_options_Test06.py | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/mta/tests/test_advanced_options_Test06.py b/mta/tests/test_advanced_options_Test06.py index 406c289..d464d77 100644 --- a/mta/tests/test_advanced_options_Test06.py +++ b/mta/tests/test_advanced_options_Test06.py @@ -64,10 +64,19 @@ def test_advanced_options(application): fs1 = FTPClientWrapper(env.ftpserver.entities.mta) file_path = fs1.download("custom.Test1rules.rhamt.xml") view.configure_analysis.use_custom_rules.upload_file.fill(file_path) - view.configure_analysis.use_custom_rules.add_rules_button.wait_displayed("30s") - view.configure_analysis.use_custom_rules.add_rules_button.click() - view.configure_analysis.use_custom_rules.select_all_rules.wait_displayed("30s") - view.configure_analysis.use_custom_rules.select_all_rules.click() + + if view.configure_analysis.use_custom_rules.add_rules_button.is_enabled: + view.configure_analysis.use_custom_rules.add_rules_button.click() + else: + wait_for(lambda: configure_analysis.use_custom_rules.add_rules_button.is_enabled, + delay=0.2, timeout=60) + view.configure_analysis.use_custom_rules.add_rules_button.click() + + if view.configure_analysis.use_custom_rules.select_all_rules.is_displayed: + view.configure_analysis.use_custom_rules.select_all_rules.click() + else: + view.configure_analysis.use_custom_rules.select_all_rules.wait_displayed("30s") + view.configure_analysis.use_custom_rules.select_all_rules.click() assert view.configure_analysis.use_custom_rules.rule.is_displayed view.configure_analysis.use_custom_rules.expand_custom_rules.click() From 4004d1cb7d28157c32028a00bcfbd240af8e3093 Mon Sep 17 00:00:00 2001 From: Shveta Sachdeva Date: Tue, 20 Oct 2020 21:37:42 -0700 Subject: [PATCH 06/15] Fixing jenkins failures --- mta/tests/test_advanced_options_Test06.py | 30 ++++++++++++++++++----- 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/mta/tests/test_advanced_options_Test06.py b/mta/tests/test_advanced_options_Test06.py index d464d77..2062218 100644 --- a/mta/tests/test_advanced_options_Test06.py +++ b/mta/tests/test_advanced_options_Test06.py @@ -68,8 +68,11 @@ def test_advanced_options(application): if view.configure_analysis.use_custom_rules.add_rules_button.is_enabled: view.configure_analysis.use_custom_rules.add_rules_button.click() else: - wait_for(lambda: configure_analysis.use_custom_rules.add_rules_button.is_enabled, - delay=0.2, timeout=60) + wait_for( + lambda: view.configure_analysis.use_custom_rules.add_rules_button.is_enabled, + delay=0.2, + timeout=60, + ) view.configure_analysis.use_custom_rules.add_rules_button.click() if view.configure_analysis.use_custom_rules.select_all_rules.is_displayed: @@ -88,10 +91,25 @@ def test_advanced_options(application): fs2 = FTPClientWrapper(env.ftpserver.entities.mta) file_path = fs2.download("customWebLogic.windup.label.xml") view.configure_analysis.use_custom_labels.upload_file.fill(file_path) - view.configure_analysis.use_custom_labels.add_labels_button.wait_displayed() - view.configure_analysis.use_custom_labels.add_labels_button.click() - view.configure_analysis.use_custom_labels.select_all_labels.wait_displayed("30s") - view.configure_analysis.use_custom_labels.select_all_labels.click() + + if view.configure_analysis.use_custom_labels.add_labels_button.is_enabled: + view.configure_analysis.use_custom_labels.add_labels_button.click() + else: + wait_for( + lambda: view.configure_analysis.use_custom_labels.add_labels_button.is_enabled, + delay=0.2, + timeout=60, + ) + view.configure_analysis.use_custom_labels.add_labels_button.click() + + if view.configure_analysis.use_custom_labels.select_all_labels.is_displayed: + view.configure_analysis.use_custom_labels.select_all_labels.click() + else: + view.configure_analysis.use_custom_labels.select_all_labels.wait_displayed("30s") + view.configure_analysis.use_custom_labels.select_all_labels.click() + assert view.configure_analysis.use_custom_labels.label.is_displayed + view.configure_analysis.use_custom_labels.expand_custom_labels.click() + assert view.configure_analysis.use_custom_labels.label.is_displayed view.configure_analysis.use_custom_labels.expand_custom_labels.click() From b5fc9304fcf7d3e194969757d0712d3ebf26994d Mon Sep 17 00:00:00 2001 From: Shveta Sachdeva Date: Tue, 20 Oct 2020 22:40:48 -0700 Subject: [PATCH 07/15] Fixing jenkins failures --- mta/entities/projects.py | 3 +-- mta/tests/test_advanced_options_Test06.py | 3 --- mta/tests/test_analysis_results_Test03.py | 19 +++---------------- 3 files changed, 4 insertions(+), 21 deletions(-) diff --git a/mta/entities/projects.py b/mta/entities/projects.py index f2bbe87..356f11c 100644 --- a/mta/entities/projects.py +++ b/mta/entities/projects.py @@ -87,7 +87,6 @@ class configure_analysis(View): # noqa locator=".//wu-select-packages/h3[normalize-space(.)='Application packages']" ) save_and_run = Button("Save & Run") - yes_button = Button("Yes") fill_strategy = WaitFillViewStrategy("15s") @property @@ -166,13 +165,13 @@ def fill(self, values): """ if values.get("transformation_path"): self.transformation_path.select_card(card_name=values.get("transformation_path")) + wait_for(lambda: self.application_packages.is_displayed, delay=0.6, timeout=500) was_change = True self.after_fill(was_change) return was_change def after_fill(self, was_change): self.save_and_run.click() - self.yes_button.click() @property def is_displayed(self): diff --git a/mta/tests/test_advanced_options_Test06.py b/mta/tests/test_advanced_options_Test06.py index 2062218..6567c37 100644 --- a/mta/tests/test_advanced_options_Test06.py +++ b/mta/tests/test_advanced_options_Test06.py @@ -110,9 +110,6 @@ def test_advanced_options(application): assert view.configure_analysis.use_custom_labels.label.is_displayed view.configure_analysis.use_custom_labels.expand_custom_labels.click() - assert view.configure_analysis.use_custom_labels.label.is_displayed - view.configure_analysis.use_custom_labels.expand_custom_labels.click() - # advanced options view.configure_analysis.advanced_options.expand_advanced_options.click() view.configure_analysis.advanced_options.add_option_button.click() diff --git a/mta/tests/test_analysis_results_Test03.py b/mta/tests/test_analysis_results_Test03.py index 250bbea..baaa81a 100644 --- a/mta/tests/test_analysis_results_Test03.py +++ b/mta/tests/test_analysis_results_Test03.py @@ -1,30 +1,17 @@ -import fauxfactory - from mta.entities.analysis_results import AnalysisResults from mta.entities.analysis_results import AnalysisResultsView -def test_analysis_results_search_sort_delete(application): +def test_analysis_results_search_sort_delete(application, create_project): """ Validates Web console Test 03 1) Upload more than one application into a project to analyse 2) Search analysis 3) Delete analysis """ - project_name = fauxfactory.gen_alphanumeric(12, start="project_") - project_collection = application.collections.projects - project = project_collection.create( - name=project_name, - description=fauxfactory.gen_alphanumeric(), - app_list=[ - "acmeair-webapp-1.0-SNAPSHOT.war", - "arit-ear-0.8.1-SNAPSHOT.ear", - "cadmium-war-0.1.0.war", - ], - transformation_path="Containerization", - ) + project, project_collection = create_project assert project.exists - analysis_results = AnalysisResults(application, project_name) + analysis_results = AnalysisResults(application, project.name) analysis_results.run_analysis() view = analysis_results.create_view(AnalysisResultsView) From e6824aedcaa30bf01d1efc8344bcf76400084e3a Mon Sep 17 00:00:00 2001 From: Shveta Sachdeva Date: Thu, 22 Oct 2020 11:00:41 -0700 Subject: [PATCH 08/15] Fixing jenkins failures --- mta/entities/projects.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/mta/entities/projects.py b/mta/entities/projects.py index 356f11c..90fd3c6 100644 --- a/mta/entities/projects.py +++ b/mta/entities/projects.py @@ -1,3 +1,5 @@ +from sys import platform + import attr from taretto.navigate import NavigateToAttribute from taretto.navigate import NavigateToSibling @@ -87,6 +89,7 @@ class configure_analysis(View): # noqa locator=".//wu-select-packages/h3[normalize-space(.)='Application packages']" ) save_and_run = Button("Save & Run") + yes_button = Button("Yes") fill_strategy = WaitFillViewStrategy("15s") @property @@ -165,13 +168,16 @@ def fill(self, values): """ if values.get("transformation_path"): self.transformation_path.select_card(card_name=values.get("transformation_path")) - wait_for(lambda: self.application_packages.is_displayed, delay=0.6, timeout=500) + if not platform == "win32": + wait_for(lambda: self.application_packages.is_displayed, delay=0.6, timeout=500) was_change = True self.after_fill(was_change) return was_change def after_fill(self, was_change): self.save_and_run.click() + if self.yes_button.is_displayed: + self.yes_button.click() @property def is_displayed(self): From b4e136534a850074b1031ac0951384b67d221d30 Mon Sep 17 00:00:00 2001 From: Shveta Sachdeva Date: Thu, 22 Oct 2020 14:09:38 -0700 Subject: [PATCH 09/15] Fixing jenkins failures --- mta/entities/projects.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/mta/entities/projects.py b/mta/entities/projects.py index 90fd3c6..21f65c7 100644 --- a/mta/entities/projects.py +++ b/mta/entities/projects.py @@ -309,7 +309,12 @@ def create(self, name, description=None, app_list=None, transformation_path=None view.wait_displayed("60s") assert view.is_displayed wait_for(lambda: view.analysis_results.in_progress(), delay=0.2, timeout=450) - wait_for(lambda: view.analysis_results.is_analysis_complete(), delay=0.2, timeout=450) + wait_for( + lambda: view.analysis_results.is_analysis_complete(), + delay=10, + timeout=450, + fail_func=view.browser.refresh, + ) assert view.analysis_results.is_analysis_complete() return project From 14f3960ba80a81d5049410494a1e9dcffaf436d4 Mon Sep 17 00:00:00 2001 From: Shveta Sachdeva Date: Thu, 22 Oct 2020 15:24:14 -0700 Subject: [PATCH 10/15] Fixing jenkins failures --- mta/entities/analysis_results.py | 4 ++++ mta/entities/projects.py | 9 +++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/mta/entities/analysis_results.py b/mta/entities/analysis_results.py index e409f6e..a109c2c 100644 --- a/mta/entities/analysis_results.py +++ b/mta/entities/analysis_results.py @@ -1,3 +1,5 @@ +from sys import platform + from taretto.navigate import NavigateToAttribute from taretto.navigate import NavigateToSibling from wait_for import wait_for @@ -76,6 +78,8 @@ def run_analysis(self): view = navigate_to(self, "AnalysisResultsPage") view.run_analysis_button.click() wait_for(lambda: view.analysis_results.in_progress(), delay=0.2, timeout=450) + if not platform == "win32": + view.browser.refresh() wait_for(lambda: view.analysis_results.is_analysis_complete(), delay=0.2, timeout=450) assert view.analysis_results.is_analysis_complete() diff --git a/mta/entities/projects.py b/mta/entities/projects.py index 21f65c7..865619a 100644 --- a/mta/entities/projects.py +++ b/mta/entities/projects.py @@ -309,12 +309,9 @@ def create(self, name, description=None, app_list=None, transformation_path=None view.wait_displayed("60s") assert view.is_displayed wait_for(lambda: view.analysis_results.in_progress(), delay=0.2, timeout=450) - wait_for( - lambda: view.analysis_results.is_analysis_complete(), - delay=10, - timeout=450, - fail_func=view.browser.refresh, - ) + if not platform == "win32": + view.browser.refresh() + wait_for(lambda: view.analysis_results.is_analysis_complete(), delay=0.2, timeout=450) assert view.analysis_results.is_analysis_complete() return project From 89daf4596a139e96c257c270301cec1e717eb2fe Mon Sep 17 00:00:00 2001 From: Shveta Sachdeva Date: Thu, 22 Oct 2020 15:34:44 -0700 Subject: [PATCH 11/15] Fixing jenkins failures --- mta/entities/analysis_results.py | 2 +- mta/entities/projects.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mta/entities/analysis_results.py b/mta/entities/analysis_results.py index a109c2c..2da76bf 100644 --- a/mta/entities/analysis_results.py +++ b/mta/entities/analysis_results.py @@ -78,7 +78,7 @@ def run_analysis(self): view = navigate_to(self, "AnalysisResultsPage") view.run_analysis_button.click() wait_for(lambda: view.analysis_results.in_progress(), delay=0.2, timeout=450) - if not platform == "win32": + if platform == "win32": view.browser.refresh() wait_for(lambda: view.analysis_results.is_analysis_complete(), delay=0.2, timeout=450) assert view.analysis_results.is_analysis_complete() diff --git a/mta/entities/projects.py b/mta/entities/projects.py index 865619a..a8c7e2e 100644 --- a/mta/entities/projects.py +++ b/mta/entities/projects.py @@ -309,7 +309,7 @@ def create(self, name, description=None, app_list=None, transformation_path=None view.wait_displayed("60s") assert view.is_displayed wait_for(lambda: view.analysis_results.in_progress(), delay=0.2, timeout=450) - if not platform == "win32": + if platform == "win32": view.browser.refresh() wait_for(lambda: view.analysis_results.is_analysis_complete(), delay=0.2, timeout=450) assert view.analysis_results.is_analysis_complete() From 9bcf9c90222830c14ca4de5c7d12cc244bf8ffca Mon Sep 17 00:00:00 2001 From: Shveta Sachdeva Date: Thu, 22 Oct 2020 18:42:42 -0700 Subject: [PATCH 12/15] Pathlib and windows fixes --- mta/entities/analysis_results.py | 2 +- mta/entities/projects.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mta/entities/analysis_results.py b/mta/entities/analysis_results.py index 2da76bf..9065a37 100644 --- a/mta/entities/analysis_results.py +++ b/mta/entities/analysis_results.py @@ -77,9 +77,9 @@ def run_analysis(self): """ Run analysis""" view = navigate_to(self, "AnalysisResultsPage") view.run_analysis_button.click() - wait_for(lambda: view.analysis_results.in_progress(), delay=0.2, timeout=450) if platform == "win32": view.browser.refresh() + wait_for(lambda: view.analysis_results.in_progress(), delay=0.2, timeout=450) wait_for(lambda: view.analysis_results.is_analysis_complete(), delay=0.2, timeout=450) assert view.analysis_results.is_analysis_complete() diff --git a/mta/entities/projects.py b/mta/entities/projects.py index a8c7e2e..e211ed0 100644 --- a/mta/entities/projects.py +++ b/mta/entities/projects.py @@ -308,9 +308,9 @@ def create(self, name, description=None, app_list=None, transformation_path=None view = self.create_view(AnalysisResultsView) view.wait_displayed("60s") assert view.is_displayed - wait_for(lambda: view.analysis_results.in_progress(), delay=0.2, timeout=450) if platform == "win32": view.browser.refresh() + wait_for(lambda: view.analysis_results.in_progress(), delay=0.2, timeout=450) wait_for(lambda: view.analysis_results.is_analysis_complete(), delay=0.2, timeout=450) assert view.analysis_results.is_analysis_complete() return project From b1398dab266b02ef20e5ac723d2be333eb825dc9 Mon Sep 17 00:00:00 2001 From: Shveta Sachdeva Date: Thu, 22 Oct 2020 21:17:25 -0700 Subject: [PATCH 13/15] Windows jenkins fixes --- mta/entities/analysis_results.py | 4 ---- mta/entities/projects.py | 4 +--- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/mta/entities/analysis_results.py b/mta/entities/analysis_results.py index 9065a37..e409f6e 100644 --- a/mta/entities/analysis_results.py +++ b/mta/entities/analysis_results.py @@ -1,5 +1,3 @@ -from sys import platform - from taretto.navigate import NavigateToAttribute from taretto.navigate import NavigateToSibling from wait_for import wait_for @@ -77,8 +75,6 @@ def run_analysis(self): """ Run analysis""" view = navigate_to(self, "AnalysisResultsPage") view.run_analysis_button.click() - if platform == "win32": - view.browser.refresh() wait_for(lambda: view.analysis_results.in_progress(), delay=0.2, timeout=450) wait_for(lambda: view.analysis_results.is_analysis_complete(), delay=0.2, timeout=450) assert view.analysis_results.is_analysis_complete() diff --git a/mta/entities/projects.py b/mta/entities/projects.py index e211ed0..c1d5dc1 100644 --- a/mta/entities/projects.py +++ b/mta/entities/projects.py @@ -308,9 +308,7 @@ def create(self, name, description=None, app_list=None, transformation_path=None view = self.create_view(AnalysisResultsView) view.wait_displayed("60s") assert view.is_displayed - if platform == "win32": - view.browser.refresh() - wait_for(lambda: view.analysis_results.in_progress(), delay=0.2, timeout=450) + wait_for(lambda: view.analysis_results.in_progress(), delay=20, timeout=450) wait_for(lambda: view.analysis_results.is_analysis_complete(), delay=0.2, timeout=450) assert view.analysis_results.is_analysis_complete() return project From 76420d98151bdfbc232ad5d40a45e3429cd47b42 Mon Sep 17 00:00:00 2001 From: Shveta Sachdeva Date: Fri, 23 Oct 2020 14:04:32 -0700 Subject: [PATCH 14/15] Windows jenkins fixes --- ..._options_Test06.py => test_project_advanced_options_Test06.py} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename mta/tests/{test_advanced_options_Test06.py => test_project_advanced_options_Test06.py} (100%) diff --git a/mta/tests/test_advanced_options_Test06.py b/mta/tests/test_project_advanced_options_Test06.py similarity index 100% rename from mta/tests/test_advanced_options_Test06.py rename to mta/tests/test_project_advanced_options_Test06.py From 5c0a514f96ed7d7f6b302092b52854fc79ce5295 Mon Sep 17 00:00:00 2001 From: Shveta Sachdeva Date: Fri, 23 Oct 2020 14:43:58 -0700 Subject: [PATCH 15/15] Windows jenkins fixes --- mta/widgetastic/__init__.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/mta/widgetastic/__init__.py b/mta/widgetastic/__init__.py index 9878dbc..3ee90de 100644 --- a/mta/widgetastic/__init__.py +++ b/mta/widgetastic/__init__.py @@ -213,18 +213,28 @@ class AnalysisResults(Widget): # When there are multiple analysis the first row is latest one # so we need to check spinner and success in 1st row SPINNER_LOCATOR = ".//div[contains(@class ,'spinner spinner-xs')]" + ANALYSIS_STATUS = ".//tr[@class ='info']//td[2]" COMPLETE_STATUS_LOCATOR = ( './/tr[1]/td[2]//wu-status-icon/span/span[contains(@class, "fa fa-check")]' ) SHOW_REPORT = './/i[contains(@class,"fa fa-bar-chart")]' def in_progress(self): - return self.browser.is_displayed(self.SPINNER_LOCATOR) + if "In Progress" in self.get_status() or self.browser.is_displayed(self.SPINNER_LOCATOR): + return True + if "Queued" in self.get_status(): + self.browser.refresh() + return False + return False def is_analysis_complete(self): """Returns True if analysis complete and spinner not present""" return self.browser.is_displayed(self.COMPLETE_STATUS_LOCATOR) + def get_status(self): + """Returns text of status""" + return self.browser.text(self.ANALYSIS_STATUS) + def show_report(self): self.browser.click(self.SHOW_REPORT) self.switch_to_report()