From 0bf7ed933e42100fc262f41bcea7e56a28759c14 Mon Sep 17 00:00:00 2001
From: mvdbeek <m.vandenbeek@gmail.com>
Date: Thu, 26 May 2022 12:59:00 +0200
Subject: [PATCH] Drop global setup_celery_includes

Should be handled by autouse fixture
---
 test/integration/test_history_import_export.py  | 17 ++---------------
 .../test_materialize_dataset_instance_tasks.py  | 11 +++--------
 test/integration/test_workflow_tasks.py         | 14 ++------------
 3 files changed, 7 insertions(+), 35 deletions(-)

diff --git a/test/integration/test_history_import_export.py b/test/integration/test_history_import_export.py
index b30dbaabf8c..60e018bbd7f 100644
--- a/test/integration/test_history_import_export.py
+++ b/test/integration/test_history_import_export.py
@@ -6,18 +6,13 @@ from galaxy.model.unittest_utils.store_fixtures import (
     one_hda_model_store_dict,
 )
 from galaxy_test.api.test_histories import ImportExportTests
+from galaxy_test.base.api import UsesCeleryTasks
 from galaxy_test.base.api_asserts import assert_has_keys
 from galaxy_test.base.populators import (
     DatasetCollectionPopulator,
     DatasetPopulator,
 )
-from galaxy_test.driver.integration_util import (
-    IntegrationTestCase,
-    setup_celery_includes,
-    UsesCeleryTasks,
-)
-
-celery_includes = setup_celery_includes()
+from galaxy_test.driver.integration_util import IntegrationTestCase
 
 
 class ImportExportHistoryOutputsToWorkingDirIntegrationTestCase(ImportExportTests, IntegrationTestCase):
@@ -38,10 +33,6 @@ class ImportExportHistoryViaTasksIntegrationTestCase(ImportExportTests, Integrat
     task_based = True
     framework_tool_and_types = True
 
-    @classmethod
-    def handle_galaxy_config_kwds(cls, config):
-        cls.setup_celery_config(config)
-
     def setUp(self):
         super().setUp()
         self._set_up_populators()
@@ -62,10 +53,6 @@ class ImportExportHistoryContentsViaTasksIntegrationTestCase(IntegrationTestCase
     task_based = True
     framework_tool_and_types = True
 
-    @classmethod
-    def handle_galaxy_config_kwds(cls, config):
-        cls.setup_celery_config(config)
-
     def setUp(self):
         super().setUp()
         self._set_up_populators()
diff --git a/test/integration/test_materialize_dataset_instance_tasks.py b/test/integration/test_materialize_dataset_instance_tasks.py
index 85fec36d07e..08638b9a331 100644
--- a/test/integration/test_materialize_dataset_instance_tasks.py
+++ b/test/integration/test_materialize_dataset_instance_tasks.py
@@ -7,24 +7,19 @@ from galaxy.model.unittest_utils.store_fixtures import (
     TEST_LIBRARY_NAME,
 )
 from galaxy.util import galaxy_directory
+from galaxy_test.base.api import UsesCeleryTasks
 from galaxy_test.base.populators import (
     DatasetPopulator,
     LibraryPopulator,
     uses_test_history,
 )
-from galaxy_test.driver.integration_util import (
-    IntegrationTestCase,
-    setup_celery_includes,
-    UsesCeleryTasks,
-)
-
-celery_includes = setup_celery_includes()
+from galaxy_test.driver.integration_util import IntegrationTestCase
 
 
 class MaterializeDatasetInstanceTasaksIntegrationTestCase(IntegrationTestCase, UsesCeleryTasks):
     @classmethod
     def handle_galaxy_config_kwds(cls, config):
-        cls.setup_celery_config(config)
+        super().handle_galaxy_config_kwds(config)
         test_data_root = os.path.join(galaxy_directory(), "test-data")
         config["file_sources"] = [
             {
diff --git a/test/integration/test_workflow_tasks.py b/test/integration/test_workflow_tasks.py
index c6a868f80f7..a5f921437d7 100644
--- a/test/integration/test_workflow_tasks.py
+++ b/test/integration/test_workflow_tasks.py
@@ -11,19 +11,14 @@ from typing import (
 
 from galaxy_test.api.test_workflows import RunsWorkflowFixtures
 from galaxy_test.base import api_asserts
+from galaxy_test.base.api import UsesCeleryTasks
 from galaxy_test.base.populators import (
     DatasetPopulator,
     RunJobsSummary,
     WorkflowPopulator,
 )
 from galaxy_test.driver.integration_setup import PosixFileSourceSetup
-from galaxy_test.driver.integration_util import (
-    IntegrationTestCase,
-    setup_celery_includes,
-    UsesCeleryTasks,
-)
-
-celery_includes = setup_celery_includes()
+from galaxy_test.driver.integration_util import IntegrationTestCase
 
 
 class WorkflowTasksIntegrationTestCase(
@@ -32,11 +27,6 @@ class WorkflowTasksIntegrationTestCase(
 
     framework_tool_and_types = True
 
-    @classmethod
-    def handle_galaxy_config_kwds(cls, config):
-        PosixFileSourceSetup.handle_galaxy_config_kwds(config, cls)
-        cls.setup_celery_config(config)
-
     def setUp(self):
         super().setUp()
         self.dataset_populator = DatasetPopulator(self.galaxy_interactor)