Rename unit test helper classes (workflow support)

test/unit/workflows/test_workflow_progress.py

@@ -2,7 +2,7 @@ import unittest
 
 from galaxy import model
 from galaxy.workflow.run import WorkflowProgress
-from .workflow_support import TestApp, yaml_to_model
+from .workflow_support import MockApp, yaml_to_model
 
 TEST_WORKFLOW_YAML = """
 steps:
@@ -64,7 +64,7 @@ UNSCHEDULED_STEP = object()
 class WorkflowProgressTestCase(unittest.TestCase):
 
     def setUp(self):
-        self.app = TestApp()
+        self.app = MockApp()
         self.inputs_by_step_id = {}
         self.invocation = model.WorkflowInvocation()
         self.progress = {}

test/unit/workflows/workflow_support.py

@@ -13,7 +13,7 @@ from galaxy.workflow.modules import module_factory
 class MockTrans:
 
     def __init__(self):
-        self.app = TestApp()
+        self.app = MockApp()
         self.sa_session = self.app.model.context
         self._user = None
 
@@ -36,8 +36,7 @@ class MockTrans:
         return self._user
 
 
-class TestApp:
-    __test__ = False  # Prevent pytest from discovering this class (issue #12071)
+class MockApp:
 
     def __init__(self):
         self.config = bunch.Bunch(
@@ -48,14 +47,13 @@ class TestApp:
             "sqlite:///:memory:",
             create_tables=True
         )
-        self.toolbox = TestToolbox()
-        self.datatypes_registry = TestDatatypesRegistry()
+        self.toolbox = MockToolbox()
+        self.datatypes_registry = MockDatatypesRegistry()
         self.security = IdEncodingHelper(id_secret="testing")
         self.workflow_manager = WorkflowsManager(self)
 
 
-class TestDatatypesRegistry:
-    __test__ = False  # Prevent pytest from discovering this class (issue #12071)
+class MockDatatypesRegistry:
 
     def __init__(self):
         pass
@@ -68,8 +66,7 @@ class TestDatatypesRegistry:
         return {"fasta": object(), "fastqsanger": object(), "txt": object()}
 
 
-class TestToolbox:
-    __test__ = False  # Prevent pytest from discovering this class (issue #12071)
+class MockToolbox:
 
     def __init__(self):
         self.tools = {}