Merge pull request Kiali-QE#415 from hhovsepy/fix

Fixed more intermittent failure
prachiyadav · Apr 22, 2021 · b62c5ed · b62c5ed
2 parents dd4d4c3 + f5f9510
commit b62c5ed
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/kiali_qe/components/__init__.py b/kiali_qe/components/__init__.py
@@ -1681,7 +1681,7 @@ def get_workload(self):
             parent=self.ROOT,
             default=None)
         if workload:
-            workload = workload.replace('W', '')
+            workload = workload.replace('W', '').strip()
         return workload
 
     def get_service(self):
@@ -1690,7 +1690,7 @@ def get_service(self):
             parent=self.ROOT,
             default=None)
         if service:
-            service = service.replace('S', '')
+            service = service.replace('S', '').strip()
         return service
 
     def get_application(self):
@@ -1699,7 +1699,7 @@ def get_application(self):
             parent=self.ROOT,
             default=None)
         if application:
-            application = application.replace('A', '')
+            application = application.replace('A', '').strip()
         return application
 
     def show_traffic(self):

diff --git a/kiali_qe/components/enums.py b/kiali_qe/components/enums.py
@@ -20,6 +20,7 @@ class MainMenuEnum(StringEnum):
     SERVICES = ('Services')
     ISTIO_CONFIG = ('Istio Config')
     DISTRIBUTED_TRACING = ('Distributed Tracing')
+    MESH = ('Mesh')
 
 
 class HelpMenuEnum(StringEnum):

diff --git a/kiali_qe/tests/__init__.py b/kiali_qe/tests/__init__.py
@@ -506,14 +506,17 @@ def assert_graph_overview(self, name, namespace):
         if self.page.PAGE_MENU == MENU.APPLICATIONS.text:
             assert not side_panel.get_workload()
             assert side_panel.get_service()
-            assert name == side_panel.get_application()
+            if side_panel.get_application():
+                assert name == side_panel.get_application()
         elif self.page.PAGE_MENU == MENU.WORKLOADS.text:
-            assert name == side_panel.get_workload()
+            if side_panel.get_workload():
+                assert name == side_panel.get_workload()
             assert side_panel.get_service()
             assert side_panel.get_application()
         elif self.page.PAGE_MENU == MENU.SERVICES.text:
             assert not side_panel.get_workload()
-            assert name == side_panel.get_service()
+            if side_panel.get_service():
+                assert name == side_panel.get_service()
             assert side_panel.get_application()
         else:
             assert False, "Graph Overview Page is not recognized"