From b9fd0a35c0697d3f8af991cc13f11737331f360f Mon Sep 17 00:00:00 2001 From: "Ian (Hee) Cha" Date: Mon, 6 May 2024 16:33:28 -0700 Subject: [PATCH] [7.2.0] Always create an empty MODULE.bazel for python tests (#22097) To prevent python tests from accessing BCR, this was missed in https://github.com/bazelbuild/bazel/commit/055e25b75c74d1e2c4c71694a938b6456323facc Closes #22089. PiperOrigin-RevId: 627384354 Change-Id: Ic4545616fad88f479b24553eb7ffe81004d41090 Commit https://github.com/bazelbuild/bazel/commit/c900865bbb3c38b589d6e5fbc422d61d3bba4681 Co-authored-by: Yun Peng --- src/test/py/bazel/bazel_workspace_test.py | 2 ++ src/test/py/bazel/test_base.py | 3 +++ 2 files changed, 5 insertions(+) diff --git a/src/test/py/bazel/bazel_workspace_test.py b/src/test/py/bazel/bazel_workspace_test.py index c414f2075f715f..dce59db65e6d6e 100644 --- a/src/test/py/bazel/bazel_workspace_test.py +++ b/src/test/py/bazel/bazel_workspace_test.py @@ -25,6 +25,8 @@ def setUp(self): self.DisableBzlmod() def testWorkspaceDotBazelFileInMainRepo(self): + # Make sure no existing MODULE.bazel file. + os.remove("MODULE.bazel") workspace_dot_bazel = self.ScratchFile("WORKSPACE.bazel") self.ScratchFile("BUILD", [ "py_binary(", diff --git a/src/test/py/bazel/test_base.py b/src/test/py/bazel/test_base.py index dfa5db18055ee6..fc0936b1729612 100644 --- a/src/test/py/bazel/test_base.py +++ b/src/test/py/bazel/test_base.py @@ -138,6 +138,9 @@ def setUp(self): # For reducing SSD usage on our physical Mac machines. f.write('common --experimental_repository_cache_hardlinks\n') f.write('common --enable_bzlmod\n') + # An empty MODULE.bazel and a corresponding MODULE.bazel.lock will prevent + # tests from accessing BCR + self.ScratchFile('MODULE.bazel') self.CopyFile( self.Rlocation('io_bazel/src/test/tools/bzlmod/MODULE.bazel.lock'), 'MODULE.bazel.lock',