fixup

airgun/entities/contentview_new.py

@@ -75,8 +75,19 @@ def delete(self, entity_name):
             view.delete_finish.click()
 
     def delete_version(self, entity_name, version):
-        """Deletes the specified version of the content view"""
-        view = self.navigate_to(self, 'Version', entity_name=entity_name, version=version)
+        """Deletes the specified version of the content view
+        :return: bool,
+            True if specified version was found and clicked 'Delete'
+            False (default) if not found in table by version name
+        """
+        result = False
+        view = self.navigate_to(
+            self,
+            'Version',
+            entity_name=entity_name,
+            version=version,
+            timeout=60,
+        )
         self.browser.plugin.ensure_page_safe(timeout='10s')
         view.wait_displayed()
         result = view.version_dropdown.item_select('Delete')
@@ -129,7 +140,13 @@ def read_repositories(self, entity_name):
 
     def read_version_table(self, entity_name, version, tab_name, search_param=None):
         """Reads a specific table for a CV Version"""
-        view = self.navigate_to(self, 'Version', entity_name=entity_name, version=version)
+        view = self.navigate_to(
+            self,
+            'Version',
+            entity_name=entity_name,
+            version=version,
+            timeout=60,
+        )
         self.browser.plugin.ensure_page_safe(timeout='5s')
         view.wait_displayed()
         # This allows dynamic access to the proper table
@@ -292,7 +309,9 @@ def prerequisite(self, *args, **kwargs):
 
     def step(self, *args, **kwargs):
         version = kwargs.get('version')
+        self.parent.versions.wait_displayed()
         self.parent.versions.search(version)
+        self.parent.versions.table.wait_displayed()
         self.parent.versions.table.row(version=version)['Version'].widget.click()