Fixes for tests.

pantsbuild · Mar 1, 2019 · c2a0743 · c2a0743
1 parent e483f84
commit c2a0743
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 11 deletions.
diff --git a/tests/python/pants_test/base/context_utils.py b/tests/python/pants_test/base/context_utils.py
@@ -119,8 +119,8 @@ def subproc_map(self, f, items):
 
 
 def create_context_from_options(options, target_roots=None, build_graph=None,
-                                build_file_parser=None, address_mapper=None, console_outstream=None,
-                                workspace=None, scheduler=None):
+                                build_configuration=None, address_mapper=None,
+                                console_outstream=None, workspace=None, scheduler=None):
   """Creates a ``Context`` with the given options and no targets by default.
 
   :param options: An :class:`pants.option.options.Option`-alike object that supports read methods.
@@ -130,6 +130,6 @@ def create_context_from_options(options, target_roots=None, build_graph=None,
   run_tracker = TestContext.DummyRunTracker()
   target_roots = maybe_list(target_roots, Target) if target_roots else []
   return TestContext(options=options, run_tracker=run_tracker, target_roots=target_roots,
-                     build_graph=build_graph, build_file_parser=build_file_parser,
+                     build_graph=build_graph, build_configuration=build_configuration,
                      address_mapper=address_mapper, console_outstream=console_outstream,
                      workspace=workspace, scheduler=scheduler)
diff --git a/tests/python/pants_test/build_graph/test_build_file_parser.py b/tests/python/pants_test/build_graph/test_build_file_parser.py
@@ -27,6 +27,10 @@ def __init__(self, *args, **kwargs):
 
 class BuildFileParserBasicsTest(TestBase):
 
+  def setUp(self):
+    super(TestBase, self).setUp()
+    self.build_file_parser = BuildFileParser(self._build_configuration, self.build_root)
+
   @classmethod
   def alias_groups(cls):
     return BuildFileAliases(targets={'jvm_binary': ErrorTarget,

diff --git a/tests/python/pants_test/test_base.py b/tests/python/pants_test/test_base.py
@@ -23,7 +23,6 @@
 from pants.build_graph.address import Address
 from pants.build_graph.build_configuration import BuildConfiguration
 from pants.build_graph.build_file_aliases import BuildFileAliases
-from pants.build_graph.build_file_parser import BuildFileParser
 from pants.build_graph.target import Target
 from pants.engine.fs import PathGlobs, PathGlobsAndRoot
 from pants.engine.legacy.graph import HydratedField
@@ -319,8 +318,6 @@ def setUp(self):
     }
 
     self._build_configuration = self.build_config()
-    self._build_file_parser = BuildFileParser(self._build_configuration, self.build_root)
-
     self._inited_target = False
 
   def buildroot_files(self, relpath=None):
@@ -363,10 +360,6 @@ def isolated_local_store(cls):
   def build_root(self):
     return self._build_root()
 
-  @property
-  def build_file_parser(self):
-    return self._build_file_parser
-
   @property
   def pants_workdir(self):
     return self._pants_workdir()
@@ -498,7 +491,7 @@ def context(self, for_task_types=None, for_subsystems=None, options=None,
     context = create_context_from_options(fake_options,
                                           target_roots=target_roots,
                                           build_graph=self.build_graph,
-                                          build_file_parser=self._build_file_parser,
+                                          build_configuration=self._build_configuration,
                                           address_mapper=address_mapper,
                                           console_outstream=console_outstream,
                                           workspace=workspace,