Merge branch 'dev'

test/selenium_tests/framework.py

@@ -10,6 +10,10 @@ import unittest
 from functools import partial, wraps
 
 import requests
+from gxformat2 import (
+    convert_and_import_workflow,
+    ImporterGalaxyInterface,
+)
 try:
     from pyvirtualdisplay import Display
 except ImportError:
@@ -20,10 +24,6 @@ from base import populators  # noqa: I100,I202
 from base.api import UsesApiTestCaseMixin  # noqa: I100
 from base.driver_util import classproperty, DEFAULT_WEB_HOST, get_ip_address  # noqa: I100
 from base.testcase import FunctionalTestCase  # noqa: I100
-from base.workflows_format_2 import (  # noqa: I100
-    convert_and_import_workflow,
-    ImporterGalaxyInterface,
-)
 from galaxy_selenium import (  # noqa: I100,I201
     driver_factory,
 )

test/selenium_tests/test_stock_tours.py

@@ -3,7 +3,8 @@ import os
 from galaxy.util import galaxy_root_path
 from .framework import (
     selenium_test,
-    SeleniumTestCase
+    SeleniumTestCase,
+    TIMEOUT_MULTIPLIER,
 )
 
 STOCK_TOURS_DIRECTORY = os.path.join(galaxy_root_path, "config", "plugins", "tours")
@@ -11,24 +12,17 @@ STOCK_TOURS_DIRECTORY = os.path.join(galaxy_root_path, "config", "plugins", "tou
 
 class TestStockToursTestCase(SeleniumTestCase):
 
-    # Test doesn't pass consistently on Jenkins yet, something is wrong is tool panel
-    # interactions. Example problems:
-    # - https://jenkins.galaxyproject.org/view/All/job/selenium/86/testReport/junit/selenium_tests.test_stock_tours/TestStockToursTestCase/test_core_galaxy_ui/
-    # - https://jenkins.galaxyproject.org/view/All/job/selenium/83/testReport/junit/selenium_tests.test_stock_tours/TestStockToursTestCase/test_core_galaxy_ui/
-    # - https://jenkins.galaxyproject.org/view/All/job/selenium/81/testReport/junit/selenium_tests.test_stock_tours/TestStockToursTestCase/test_core_galaxy_ui/
-    # I'd think that just pausing a bit between transitions to allow the tool panel to
-    # settle would fix it but it doesn't seem to in my initial testing. -John
-    # Tracking with https://github.com/galaxyproject/galaxy/issues/3598
-    # @selenium_test
-    # def test_core_galaxy_ui(self):
-    #    sleep_on_steps = {
-    #        "Tools": 20,  # Give upload a chance to take so tool form is filled in.
-    #        "History": 20,
-    #    }
-    #    self.run_tour(
-    #        os.path.join(STOCK_TOURS_DIRECTORY, "core.galaxy_ui.yaml"),
-    #        sleep_on_steps=sleep_on_steps,
-    #    )
+    @selenium_test
+    def test_core_galaxy_ui(self):
+        sleep_on_steps = {
+            "Tools": 20 * TIMEOUT_MULTIPLIER,
+            "Select a tool": 2 * TIMEOUT_MULTIPLIER,
+            "History": 20 * TIMEOUT_MULTIPLIER,
+        }
+        self.run_tour(
+            os.path.join(STOCK_TOURS_DIRECTORY, "core.galaxy_ui.yaml"),
+            sleep_on_steps=sleep_on_steps
+        )
 
     @selenium_test
     def test_core_scratchbook(self):