Add .bzl files explicitly to toolchain tests to detect .bzl file changes (bazel-contrib#815)

fishcakez · f0rmiga · web-flow · commit 369074e3e5db · 2022-09-28T11:01:34.000-07:00
Co-authored-by: Thulio Ferraz Assis &lt;3149049+f0rmiga@users.noreply.github.com&gt;
diff --git a/BUILD b/BUILD
@@ -39,6 +39,7 @@ filegroup(
     ],
     visibility = [
         "//examples:__pkg__",
+        "//python/tests/toolchains:__pkg__",
         "//tests:__pkg__",
     ],
 )
diff --git a/python/tests/toolchains/defs.bzl b/python/tests/toolchains/defs.bzl
@@ -39,10 +39,6 @@ def _acceptance_test_impl(ctx):
     )
 
     python_version_test = ctx.actions.declare_file("/".join([ctx.attr.python_version, "python_version_test.py"]))
-
-    # With the current approach in the run_acceptance_test.sh, we use this
-    # symlink to find the absolute path to the rules_python to be passed to the
-    # --override_repository rules_python=<rules_python_path>.
     ctx.actions.symlink(
         target_file = ctx.file._python_version_test,
         output = python_version_test,
@@ -92,7 +88,7 @@ def _acceptance_test_impl(ctx):
         python_version_test,
         run_acceptance_test_py,
         workspace,
-    ]
+    ] + ctx.files._distribution
     return [DefaultInfo(
         executable = executable,
         files = depset(
@@ -126,6 +122,10 @@ _acceptance_test = rule(
             allow_single_file = True,
             default = Label("//python/tests/toolchains/workspace_template:BUILD.bazel.tmpl"),
         ),
+        "_distribution": attr.label(
+            doc = "The rules_python source distribution.",
+            default = Label("//:distribution"),
+        ),
         "_python_version_test": attr.label(
             doc = "The python_version_test.py used to test the Python version.",
             allow_single_file = True,
diff --git a/python/tests/toolchains/run_acceptance_test.py.tmpl b/python/tests/toolchains/run_acceptance_test.py.tmpl
@@ -21,12 +21,7 @@ class TestPythonVersion(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
         os.chdir("%test_location%")
-        python_version_test_dirname = os.path.dirname(
-            os.path.realpath("python_version_test.py")
-        )
-        rules_python_path = os.path.normpath(
-            os.path.join(python_version_test_dirname, "..", "..", "..", "..")
-        )
+        rules_python_path = os.path.join(os.environ["TEST_SRCDIR"], "rules_python")
 
         if %is_windows%:
             test_tmpdir = os.environ["TEST_TMPDIR"]

Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,7 @@ filegroup(`
`39`	`39`	`],`
`40`	`40`	`visibility = [`
`41`	`41`	`"//examples:__pkg__",`
	`42`	`+ "//python/tests/toolchains:__pkg__",`
`42`	`43`	`"//tests:__pkg__",`
`43`	`44`	`],`
`44`	`45`	`)`