[internal] Delete the python_integration_tests macro (pantsbuild#11830

)

Now that we don't run tests via `pants.pex`, there is no need for the old `int-test` target we had. Removing the macro allows us to delete several unnecessary targets and to simplify our BUILD files.

We do lose the tag `integration_test`, but we never used that in CI anymore anyways.

[ci skip-rust]
[ci skip-build-wheels]

BUILD

@@ -1,11 +1,6 @@
 # Copyright 2019 Pants project contributors (see CONTRIBUTORS.md).
 # Licensed under the Apache License, Version 2.0 (see LICENSE).
 
-files(
-  name = '3rdparty_directory',
-  sources = ['3rdparty/**/*'],
-)
-
 # We use this to establish the build root, rather than `./pants`, because we cannot safely use the
 # latter as the sentinel filename per https://github.com/pantsbuild/pants/pull/8105.
 files(

pants.toml

@@ -23,7 +23,6 @@ plugins = [
   # TODO: Remove the relevant `ignore_pants_warning` entry when this is bumped.
   "toolchain.pants.plugin==0.7.0",
 ]
-build_file_prelude_globs = ["pants-plugins/python_integration_tests_macro.py"]
 
 ignore_pants_warnings = [
   # TODO: Remove when `toolchain.pants.plugin` is bumped past `0.7.0`.

src/python/pants/backend/python/goals/BUILD

@@ -9,8 +9,8 @@ python_tests(
   timeout=180,
 )
 
-python_integration_tests(
-  name='integration',
-  uses_pants_run=True,
+python_tests(
+  name="integration",
+  sources=["*_integration_test.py"],
   timeout=480,
 )

src/python/pants/backend/python/lint/BUILD

@@ -2,4 +2,4 @@
 # Licensed under the Apache License, Version 2.0 (see LICENSE).
 
 python_library()
-python_integration_tests(name='integration', uses_pants_run=False, timeout=180)
+python_tests(name="tests", timeout=180)

src/python/pants/backend/python/lint/bandit/BUILD

@@ -2,9 +2,4 @@
 # Licensed under the Apache License, Version 2.0 (see LICENSE).
 
 python_library()
-
-python_integration_tests(
-  name='integration',
-  uses_pants_run=False,
-  timeout=240,
-)
+python_tests(name="tests", timeout=240)

src/python/pants/backend/python/lint/black/BUILD

@@ -2,9 +2,4 @@
 # Licensed under the Apache License, Version 2.0 (see LICENSE).
 
 python_library()
-
-python_integration_tests(
-  name='integration',
-  uses_pants_run=False,
-  timeout=240,
-)
+python_tests(name="tests", timeout=240)

src/python/pants/backend/python/lint/docformatter/BUILD

@@ -2,9 +2,4 @@
 # Licensed under the Apache License, Version 2.0 (see LICENSE).
 
 python_library()
-
-python_integration_tests(
-  name='integration',
-  uses_pants_run=False,
-  timeout=120,
-)
+python_tests(name="tests", timeout=120)

src/python/pants/backend/python/lint/flake8/BUILD

@@ -2,9 +2,4 @@
 # Licensed under the Apache License, Version 2.0 (see LICENSE).
 
 python_library()
-
-python_integration_tests(
-  name='integration',
-  uses_pants_run=False,
-  timeout=180,
-)
+python_tests(name="tests", timeout=180)

src/python/pants/backend/python/lint/isort/BUILD

@@ -2,9 +2,4 @@
 # Licensed under the Apache License, Version 2.0 (see LICENSE).
 
 python_library()
-
-python_integration_tests(
-  name='integration',
-  uses_pants_run=False,
-  timeout=120,
-)
+python_tests(name="tests", timeout=120)

src/python/pants/backend/python/lint/pylint/BUILD

@@ -2,9 +2,4 @@
 # Licensed under the Apache License, Version 2.0 (see LICENSE).
 
 python_library()
-
-python_integration_tests(
-  name='integration',
-  uses_pants_run=False,
-  timeout=330,
-)
+python_tests(name="tests", timeout=330)

src/python/pants/backend/python/typecheck/mypy/BUILD

@@ -2,9 +2,4 @@
 # Licensed under the Apache License, Version 2.0 (see LICENSE).
 
 python_library()
-
-python_integration_tests(
-  name='integration',
-  uses_pants_run=False,
-  timeout=480,
-)
+python_tests(name="tests", timeout=480)

src/python/pants/base/BUILD

@@ -18,24 +18,22 @@ python_tests(
   timeout=90,
 )
 
-python_integration_tests(
+python_tests(
   name='exception_sink_integration_test',
   sources=['exception_sink_integration_test.py'],
   dependencies=[
     'testprojects/src/python:coordinated_runs_directory',
     'testprojects/src/python:hello_directory',
     'testprojects:pants_plugins_directory',
   ],
-  uses_pants_run=True,
   tags=['platform_specific_behavior'],
   # NB: This frequently times out, but due to hanging. So, we want to fail eagerly. See
   # https://github.com/pantsbuild/pants/issues/8127.
   timeout=400,
 )
 
-python_integration_tests(
+python_tests(
   name='exiter_integration_test',
   sources=['exiter_integration_test.py'],
-  uses_pants_run=True,
   timeout=180,
 )

src/python/pants/base/exception_sink_integration_test.py

@@ -78,7 +78,12 @@ def test_logs_unhandled_exception() -> None:
     directory = "testprojects/src/python/hello/main"
     with temporary_dir() as tmpdir:
         pants_run = run_pants_with_workdir(
-            ["--no-pantsd", "list", f"{directory}:this-target-does-not-exist"],
+            [
+                "--no-pantsd",
+                "list",
+                f"{directory}:this-target-does-not-exist",
+                "--backend-packages=['pants.backend.python']",
+            ],
             workdir=tmpdir,
             # The backtrace should be omitted when --print-stacktrace=False.
             print_stacktrace=False,

src/python/pants/bin/BUILD

@@ -25,30 +25,4 @@ pex_binary(
   emit_warnings=False,
 )
 
-# This binary is for internal use only. It adds deps on internal_plugins and build-support config
-# files, both of which are not meant for publishing in the `pantsbuild.pants` sdist.
-pex_binary(
-  name='pants_local_binary',
-  entry_point='pants.bin.pants_loader:main',
-  dependencies=[
-    ':pants_loader',
-    '//:build_root',
-    '//:pants_toml',
-    '//:3rdparty_directory',
-    '//:pyproject',
-    'build-support/flake8',
-    'build-support/mypy',
-    'build-support/regexes',
-    'pants-plugins/internal_plugins/releases',
-  ],
-  # We depend on twitter.common libraries that trigger pex warnings for not properly declaring their
-  # dependency on setuptools (for namespace package support).
-  emit_warnings=False,
-  # To allow for loading `native_engine.so` when built as a pex, we set zip_safe=False.
-  zip_safe=False,
-)
-
-python_integration_tests(
-  name='integration',
-  uses_pants_run=True,
-)
+python_tests(name="tests")

src/python/pants/build_graph/BUILD

@@ -2,14 +2,4 @@
 # Licensed under the Apache License, Version 2.0 (see LICENSE).
 
 python_library()
-
-python_tests(
-  name="tests",
-  sources=["*_test.py", "!*_integration_test.py"],
-)
-
-python_integration_tests(
-  name='integration',
-  uses_pants_run=True,
-  timeout=180,
-)
+python_tests(name="tests")

src/python/pants/core/goals/BUILD

@@ -3,17 +3,11 @@
 
 python_library()
 
-python_tests(
-  name = "tests",
-  sources=['*_test.py', '!*_integration_test.py'],
-)
+python_tests(name="tests", sources=['*_test.py', '!*_integration_test.py'])
 
-python_integration_tests(
-  name='integration',
-  uses_pants_run=True,
-  dependencies=[
-    'testprojects/src/python:hello_directory',
-    '//:pyproject',
-  ],
+python_tests(
+  name="integration",
+  sources=["*_integration_test.py"],
+  dependencies=['testprojects/src/python:hello_directory', '//:pyproject'],
   timeout=240,
 )

src/python/pants/engine/BUILD

@@ -6,15 +6,15 @@ python_library()
 python_tests(
   name='tests',
   dependencies=['src/python/pants/engine/internals:fs_test_data'],
-  sources=["*_test.py", "!*_integration_test.py"],
+  sources=["*_test.py", "!streaming_workunit_handler_integration_test.py"],
   timeout=90,
 )
 
-python_integration_tests(
-  name='integration_tests',
-  uses_pants_run=True,
+python_tests(
+  name="streaming_workunit_handler_integration_test",
+  sources=["streaming_workunit_handler_integration_test.py"],
   dependencies=[
       # Loaded reflectively as a backend in `streaming_workunit_handler_integration_test.py`.
-      'testprojects/pants-plugins/src/python/workunit_logger',
+      "testprojects/pants-plugins/src/python/workunit_logger",
   ],
 )

src/python/pants/engine/internals/BUILD

@@ -7,13 +7,13 @@ python_library(
 
 python_tests(
   name='tests',
-  sources=['*_test.py', '!*_integration_test.py'],
+  sources=['*_test.py', '!scheduler_integration_test.py'],
   timeout=90,
 )
 
-python_integration_tests(
-  name='integration',
-  uses_pants_run=True,
+python_tests(
+  name="scheduler_integration_test",
+  sources=["scheduler_integration_test.py"],
   dependencies=[
     'pants-plugins/internal_plugins/rules_for_testing',
     'testprojects/src/python:hello_directory',

src/python/pants/engine/streaming_workunit_handler_integration_test.py

@@ -5,7 +5,7 @@
 
 import os
 import signal
-from typing import List, Mapping, Tuple
+from typing import Mapping
 
 from workunit_logger.register import FINISHED_SUCCESSFULLY
 
@@ -28,10 +28,13 @@ def workunit_logger_config(log_dest: str) -> Mapping:
     }
 
 
-def run(args: List[str], success: bool = True) -> Tuple[PantsResult, str | None]:
-    with setup_tmpdir({}) as tmpdir:
+def run(
+    args: list[str], success: bool = True, *, files: dict[str, str] | None = None
+) -> tuple[PantsResult, str | None]:
+    with setup_tmpdir(files or {}) as tmpdir:
         dest = os.path.join(tmpdir, "dest.log")
-        pants_run = run_pants(args, config=workunit_logger_config(dest))
+        normalized_args = [arg.format(tmpdir=tmpdir) for arg in args]
+        pants_run = run_pants(normalized_args, config=workunit_logger_config(dest))
         log_content = maybe_read_file(dest)
         if success:
             pants_run.assert_success()
@@ -43,7 +46,7 @@ def run(args: List[str], success: bool = True) -> Tuple[PantsResult, str | None]
 
 
 def test_list() -> None:
-    run(["list", "3rdparty::"])
+    run(["list", "{tmpdir}/foo::"], files={"foo/BUILD": "files(sources=[])"})
 
 
 def test_help() -> None:

src/python/pants/goal/BUILD

@@ -3,4 +3,4 @@
 
 python_library()
 python_tests(name='tests', sources=["*_test.py", "!*_integration_test.py"])
-python_integration_tests(name="integration", uses_pants_run=True, timeout=120)
+python_tests(name="integration", sources=["*_integration_test.py"], timeout=120)

src/python/pants/help/BUILD

@@ -9,8 +9,4 @@ python_tests(
   dependencies=["//:build_root"],
 )
 
-python_integration_tests(
-  name='integration',
-  uses_pants_run=True,
-  timeout=360,
-)
+python_tests(name="integration", sources=["*_integration_test.py"], timeout=360)

src/python/pants/init/BUILD

@@ -1,11 +1,7 @@
 # Copyright 2017 Pants project contributors (see CONTRIBUTORS.md).
 # Licensed under the Apache License, Version 2.0 (see LICENSE).
 
-python_library(
-  dependencies=[
-    ':plugins',
-  ],
-)
+python_library(dependencies=[":plugins"])
 
 target(
   name='plugins',
@@ -26,8 +22,4 @@ target(
   ],
 )
 
-python_integration_tests(
-  name="integration",
-  uses_pants_run=True,
-  timeout=200,
-)
+python_tests(name="tests", timeout=200)

src/python/pants/option/BUILD

@@ -5,16 +5,10 @@ python_library()
 
 python_tests(
   name="tests",
-  sources=['*_test.py', '!*_integration_test.py'],
   dependencies=[
     # Used by `options_bootstrapper_test` and `config_test`.
     '//:build_root',
     '//:pants_toml',
   ],
   timeout=300,
 )
-
-python_integration_tests(
-  name='integration',
-  uses_pants_run=True,
-)