fix test failures

pantsbuild · Dec 27, 2019 · d91944f · d91944f
1 parent 0d5bbb0
commit d91944f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/src/python/pants/backend/awslambda/python/awslambda_python_rules_test.py b/src/python/pants/backend/awslambda/python/awslambda_python_rules_test.py
@@ -13,7 +13,8 @@
   setup_lambdex,
 )
 from pants.backend.awslambda.python.lambdex import Lambdex
-from pants.backend.python.rules.download_pex_bin import download_pex_bin
+from pants.backend.python.rules.download_pex_bin import DownloadedPexBin
+from pants.backend.python.rules.download_pex_bin import rules as download_pex_bin_rules
 from pants.backend.python.rules.inject_init import inject_init
 from pants.backend.python.rules.pex import create_pex
 from pants.backend.python.rules.pex_from_target_closure import create_pex_from_target_closure
@@ -51,7 +52,7 @@ def rules(cls):
       create_pex_native_build_environment,
       create_subprocess_encoding_environment,
       strip_source_root,
-      download_pex_bin,
+      *download_pex_bin_rules(),
       inject_init,
       create_pex_from_target_closure,
       RootRule(Digest),
@@ -62,12 +63,13 @@ def rules(cls):
       RootRule(Lambdex),
       RootRule(LambdexSetup),
       RootRule(PythonAWSLambdaAdaptor),
+      RootRule(DownloadedPexBin.Factory),
     ]
 
   def setUp(self):
     super().setUp()
     init_subsystems([SourceRootConfig, PythonSetup, PythonNativeCode,
-                     SubprocessEnvironment, Lambdex])
+                     SubprocessEnvironment, Lambdex, DownloadedPexBin.Factory])
 
   def create_python_awslambda(self, addr: str) -> Tuple[str, bytes]:
     lambdex_setup = self.request_single_product(
@@ -77,6 +79,7 @@ def create_python_awslambda(self, addr: str) -> Tuple[str, bytes]:
         PythonNativeCode.global_instance(),
         SubprocessEnvironment.global_instance(),
         Lambdex.global_instance(),
+        DownloadedPexBin.Factory.global_instance(),
       )
     )
     target = self.request_single_product(HydratedTarget, Address.parse(addr))

diff --git a/tests/python/pants_test/binaries/test_binary_tool.py b/tests/python/pants_test/binaries/test_binary_tool.py
@@ -40,7 +40,7 @@ class ReplacingLegacyOptionsTool(BinaryToolBase):
 
 class BinaryUtilFakeUname(BinaryUtil):
 
-  def _host_platform(self):
+  def host_platform(self):
     return HostPlatform('xxx', 'yyy')
 
 

diff --git a/tests/python/pants_test/binaries/test_binary_util.py b/tests/python/pants_test/binaries/test_binary_util.py
@@ -70,7 +70,7 @@ def _fake_url(cls, binaries, base, binary_key):
     supportdir, version, name = binaries[binary_key]
     binary_request = binary_util._make_deprecated_binary_request(supportdir, version, name)
 
-    binary_path = binary_request.get_download_path(binary_util._host_platform())
+    binary_path = binary_request.get_download_path(binary_util.host_platform())
     return f'{base}/{binary_path}'
 
   @classmethod
@@ -148,7 +148,7 @@ def test_support_url_multi(self):
         version='2.4.1',
         name='protoc')
 
-      binary_path = binary_request.get_download_path(binary_util._host_platform())
+      binary_path = binary_request.get_download_path(binary_util.host_platform())
       contents = b'proof'
       with safe_open(os.path.join(valid_local_files, binary_path), 'wb') as fp:
         fp.write(contents)