Remove TestBase.context()

src/python/pants/engine/internals/scheduler_test_base.py

@@ -79,9 +79,6 @@ def mk_scheduler(
             build_id="buildid_for_test", should_report_workunits=should_report_workunits,
         )
 
-    def context_with_scheduler(self, scheduler, *args, **kwargs):
-        return self.context(*args, scheduler=scheduler, **kwargs)
-
     def execute(self, scheduler, product, *subjects):
         """Runs an ExecutionRequest for the given product and subjects, and returns the result
         value."""

src/python/pants/source/source_root_test.py

@@ -188,27 +188,21 @@ def test_all_roots(self):
             "fixed/root/jvm",
         )
 
-        options = {
-            "pants_ignore": [],
-            "root_patterns": [
+        source_root_config = create_subsystem(
+            SourceRootConfig,
+            root_patterns=[
                 "src/*",
                 "src/example/*",
                 "contrib/go/examples/src/go/src",
                 # Dir does not exist, should not be listed as a root.
                 "java",
                 "fixed/root/jvm",
             ],
-        }
-        options.update(self.options[""])  # We need inherited values for pants_workdir etc.
-
-        self.context(
-            for_subsystems=[SourceRootConfig], options={SourceRootConfig.options_scope: options}
+            marker_filenames=[],
         )
 
-        source_root_config = SourceRootConfig.global_instance()
-
         # This function mocks out reading real directories off the file system.
-        def provider_rule(path_globs: PathGlobs) -> Snapshot:
+        def provider_rule(_: PathGlobs) -> Snapshot:
             return Snapshot(Digest("abcdef", 10), (), dirs)
 
         def source_root_mock_rule(req: SourceRootRequest) -> OptionalSourceRoot:
@@ -230,36 +224,25 @@ def source_root_mock_rule(req: SourceRootRequest) -> OptionalSourceRoot:
             ],
         )
 
-        self.assertEqual(
-            {
-                SourceRoot("contrib/go/examples/src/go/src"),
-                SourceRoot("src/java"),
-                SourceRoot("src/python"),
-                SourceRoot("src/python/subdir/src/python"),
-                SourceRoot("src/kotlin"),
-                SourceRoot("src/example/java"),
-                SourceRoot("src/example/python"),
-                SourceRoot("my/project/src/java"),
-                SourceRoot("fixed/root/jvm"),
-            },
-            set(output),
-        )
+        assert {
+            SourceRoot("contrib/go/examples/src/go/src"),
+            SourceRoot("src/java"),
+            SourceRoot("src/python"),
+            SourceRoot("src/python/subdir/src/python"),
+            SourceRoot("src/kotlin"),
+            SourceRoot("src/example/java"),
+            SourceRoot("src/example/python"),
+            SourceRoot("my/project/src/java"),
+            SourceRoot("fixed/root/jvm"),
+        } == set(output)
 
     def test_all_roots_with_root_at_buildroot(self):
-        options = {
-            "pants_ignore": [],
-            "root_patterns": ["/"],
-        }
-        options.update(self.options[""])  # We need inherited values for pants_workdir etc.
-
-        self.context(
-            for_subsystems=[SourceRootConfig], options={SourceRootConfig.options_scope: options}
+        source_root_config = create_subsystem(
+            SourceRootConfig, root_patterns=["/"], marker_filenames=[],
         )
 
-        source_root_config = SourceRootConfig.global_instance()
-
         # This function mocks out reading real directories off the file system
-        def provider_rule(path_globs: PathGlobs) -> Snapshot:
+        def provider_rule(_: PathGlobs) -> Snapshot:
             dirs = ("foo",)  # A python package at the buildroot.
             return Snapshot(Digest("abcdef", 10), (), dirs)
 
@@ -275,5 +258,4 @@ def provider_rule(path_globs: PathGlobs) -> Snapshot:
                 ),
             ],
         )
-
-        self.assertEqual({SourceRoot(".")}, set(output))
+        assert {SourceRoot(".")} == set(output)

src/python/pants/testutil/BUILD

@@ -6,7 +6,6 @@ python_library(
   dependencies=[
     ':int-test-for-export',
     ':test_base',
-    'src/python/pants/testutil/base:context_utils',
     'src/python/pants/testutil/engine',
     'src/python/pants/testutil/option',
     'src/python/pants/testutil/subsystem',
@@ -75,7 +74,6 @@ python_library(
     'src/python/pants/source',
     'src/python/pants/subsystem',
     'src/python/pants/task',
-    'src/python/pants/testutil/base:context_utils',
     'src/python/pants/testutil/engine',
     'src/python/pants/testutil/option',
     'src/python/pants/testutil/subsystem',