Address latest review comments

pantsbuild · Oct 2, 2019 · ddca228 · ddca228
1 parent f8ef9de
commit ddca228
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 10 deletions.
diff --git a/src/python/pants/backend/python/rules/python_fmt.py b/src/python/pants/backend/python/rules/python_fmt.py
@@ -1,7 +1,6 @@
 # Copyright 2019 Pants project contributors (see CONTRIBUTORS.md).
 # Licensed under the Apache License, Version 2.0 (see LICENSE).
 
-import os
 import re
 from dataclasses import dataclass
 from pathlib import Path

diff --git a/src/python/pants/bin/BUILD b/src/python/pants/bin/BUILD
@@ -77,6 +77,7 @@ python_binary(
     '//:build_tools',
     '//:pants_ini',
     '//:3rdparty_directory',
+    '//:pyproject',
     'build-support/checkstyle',
     'build-support/eslint',
     'build-support/ivy',

diff --git a/src/python/pants/rules/core/fmt.py b/src/python/pants/rules/core/fmt.py
@@ -1,7 +1,6 @@
 # Copyright 2019 Pants project contributors (see CONTRIBUTORS.md).
 # Licensed under the Apache License, Version 2.0 (see LICENSE).
 
-import os
 from dataclasses import dataclass
 from pathlib import Path
 

diff --git a/tests/python/pants_test/backend/python/rules/BUILD b/tests/python/pants_test/backend/python/rules/BUILD
@@ -45,11 +45,9 @@ python_tests(
   source='test_python_fmt_integration.py',
   dependencies=[
     'tests/python/pants_test:int-test',
-    '//:pyproject',
     'testprojects/src/python:unicode_directory',
     'examples/src/python/example:hello_directory',
   ],
   tags={'integration'},
-  timeout = 90,
 )
 
diff --git a/tests/python/pants_test/backend/python/rules/test_python_fmt_integration.py b/tests/python/pants_test/backend/python/rules/test_python_fmt_integration.py
@@ -2,6 +2,7 @@
 # Licensed under the Apache License, Version 2.0 (see LICENSE).
 
 from os.path import relpath
+from pathlib import Path
 
 from pants.util.contextutil import temporary_file, temporary_file_path
 from pants_test.pants_run_integration_test import PantsRunIntegrationTest, ensure_daemon
@@ -70,8 +71,7 @@ def test_black_should_format_python_code(self):
         'examples/src/python/example/hello/greet:greet'
         ]
       pants_run = self.run_pants(command=command)
-      code = open(file_name)
-      formatted = code.read();
+      formatted = Path(file_name).read_text();
       self.assertEqual("x = 42\n", formatted)
     self.assert_success(pants_run)
     self.assertIn("1 file reformatted", pants_run.stderr_data)

diff --git a/tests/python/pants_test/pants_run_integration_test.py b/tests/python/pants_test/pants_run_integration_test.py
@@ -328,7 +328,8 @@ def run_pants_with_workdir_without_waiting(self, command, workdir, config=None,
         ini.write(fp)
       args.append('--pants-config-files=' + ini_file_name)
 
-    Path('pyproject.toml').touch()
+    if not Path(get_buildroot()).samefile(Path(".")):
+      shutil.copy(str(Path(get_buildroot(), "pyproject.toml")), str(Path(".")))
 
     pants_script = [sys.executable, '-m', 'pants']
 

diff --git a/tests/python/pants_test/rules/BUILD b/tests/python/pants_test/rules/BUILD
@@ -44,10 +44,8 @@ python_tests(
   source='test_fmt_integration.py',
   dependencies=[
     'tests/python/pants_test:int-test',
-    '//:pyproject',
     'testprojects/tests/java/org/pantsbuild/testproject:dummies_directory',
   ],
   tags={'integration'},
-  timeout = 90,
 )
 
diff --git a/tests/python/pants_test/rules/test_fmt_integration.py b/tests/python/pants_test/rules/test_fmt_integration.py
@@ -5,7 +5,7 @@
 
 
 class FmtIntegrationTest(PantsRunIntegrationTest):
-  def test_black_no_python_sources_should_noop(self):
+  def test_fmt_for_unsupported_target_should_noop(self):
     command = [
       'fmt-v2',
       'testprojects/tests/java/org/pantsbuild/testproject/dummies/::'