Move V2 rules tests from tests to src (pantsbuild#8667)

Currently, some of these tests live in `src` and some in `tests`. They should all live together in `src`. This also renames the files to use the convention `foo_test.py` and `foo_integration_test.py`, along with changing the BUILD entries to be less granular.
benjyw · Nov 20, 2019 · c25ed38 · c25ed38
1 parent 038b793
commit c25ed38
Show file tree

Hide file tree

Showing 14 changed files with 58 additions and 140 deletions.
diff --git a/src/python/pants/backend/python/rules/BUILD b/src/python/pants/backend/python/rules/BUILD
@@ -1,3 +1,6 @@
+# Copyright 2018 Pants project contributors (see CONTRIBUTORS.md).
+# Licensed under the Apache License, Version 2.0 (see LICENSE).
+
 python_library(
   dependencies=[
     '3rdparty/python:dataclasses',
@@ -12,3 +15,39 @@ python_library(
     'src/python/pants/source:source',
   ],
 )
+
+python_tests(
+  name='tests',
+  sources=globs('*_test.py', exclude=[globs('*_integration_test.py')]),
+  dependencies=[
+    ':rules',
+    'src/python/pants/backend/python/subsystems',
+    'src/python/pants/build_graph',
+    'src/python/pants/engine:fs',
+    'src/python/pants/engine:isolated_process',
+    'src/python/pants/engine:rules',
+    'src/python/pants/engine:selectors',
+    'src/python/pants/engine/legacy:graph',
+    'src/python/pants/engine/legacy:structs',
+    'src/python/pants/rules/core',
+    'src/python/pants/testutil:test_base',
+    'src/python/pants/testutil/engine:util',
+    'src/python/pants/testutil/subsystem',
+    'src/python/pants/util:collections',
+    'src/python/pants/util:contextutil',
+  ],
+)
+
+
+python_tests(
+  name='integration',
+  sources=globs('*_integration_test.py'),
+  dependencies=[
+    'src/python/pants/testutil:int-test',
+    'examples/src/python/example:hello_directory',
+    'testprojects/src/python:unicode_directory',
+    'testprojects/tests/python/pants:dummies_directory',
+  ],
+  tags = {'integration'},
+  timeout = 180,
+)
diff --git a/.../backend/python/rules/test_inject_init.py → .../backend/python/rules/inject_init_test.py b/.../backend/python/rules/test_inject_init.py → .../backend/python/rules/inject_init_test.py
diff --git a/...nts_test/backend/python/rules/test_pex.py → ...on/pants/backend/python/rules/pex_test.py b/...nts_test/backend/python/rules/test_pex.py → ...on/pants/backend/python/rules/pex_test.py
diff --git a/...thon/rules/test_python_fmt_integration.py → ...thon/rules/python_fmt_integration_test.py b/...thon/rules/test_python_fmt_integration.py → ...thon/rules/python_fmt_integration_test.py
diff --git a/...es/test_python_test_runner_integration.py → ...es/python_test_runner_integration_test.py b/...es/test_python_test_runner_integration.py → ...es/python_test_runner_integration_test.py
diff --git a/...d/python/rules/test_python_test_runner.py → ...d/python/rules/python_test_runner_test.py b/...d/python/rules/test_python_test_runner.py → ...d/python/rules/python_test_runner_test.py
diff --git a/src/python/pants/rules/core/BUILD b/src/python/pants/rules/core/BUILD
@@ -19,12 +19,31 @@ python_library(
 
 python_tests(
   name = "tests",
+  sources=globs('*_test.py', exclude=[globs('*_integration_test.py')]),
   dependencies = [
     ':core',
+    'src/python/pants/backend/codegen/thrift/java',
+    'src/python/pants/backend/jvm/targets:all',
+    'src/python/pants/backend/python/targets',
+    'src/python/pants/build_graph',
+    'src/python/pants/engine/legacy:graph',
+    'src/python/pants/engine/legacy:structs',
     'src/python/pants/testutil:test_base',
     'src/python/pants/testutil:console_rule_test_base',
     'src/python/pants/testutil/engine:util',
     'src/python/pants/testutil/subsystem',
   ]
 )
 
+python_tests(
+  name='integration',
+  sources=globs('*_integration_test.py'),
+  dependencies=[
+    'src/python/pants/testutil:int-test',
+    'examples/src/java/org/pantsbuild/example:hello_directory',
+    'examples/src/scala/org/pantsbuild/example:hello_directory',
+    'examples/src/resources/org/pantsbuild/example:hello_directory',
+    'testprojects/tests/java/org/pantsbuild/testproject:dummies_directory',
+  ],
+  tags = {'integration'},
+)
diff --git a/...s_test/rules/test_filedeps_integration.py → ...s/rules/core/filedeps_integration_test.py b/...s_test/rules/test_filedeps_integration.py → ...s/rules/core/filedeps_integration_test.py
diff --git a/.../python/pants_test/rules/test_filedeps.py → src/python/pants/rules/core/filedeps_test.py b/.../python/pants_test/rules/test_filedeps.py → src/python/pants/rules/core/filedeps_test.py
diff --git a/.../pants_test/rules/test_fmt_integration.py → .../pants/rules/core/fmt_integration_test.py b/.../pants_test/rules/test_fmt_integration.py → .../pants/rules/core/fmt_integration_test.py
diff --git a/tests/python/pants_test/rules/test_run.py → src/python/pants/rules/core/run_test.py b/tests/python/pants_test/rules/test_run.py → src/python/pants/rules/core/run_test.py
diff --git a/tests/python/pants_test/rules/test_test.py → src/python/pants/rules/core/test_test.py b/tests/python/pants_test/rules/test_test.py → src/python/pants/rules/core/test_test.py
diff --git a/tests/python/pants_test/backend/python/rules/BUILD b/tests/python/pants_test/backend/python/rules/BUILD
diff --git a/tests/python/pants_test/rules/BUILD b/tests/python/pants_test/rules/BUILD