Merge branch 'release-7.5.0' into cp24295-7.5.0

bazelbuild · Dec 16, 2024 · 1c08b72 · 1c08b72
2 parents 482da4e + a1f7f65
commit 1c08b72
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/src/test/py/bazel/bzlmod/bazel_overrides_test.py b/src/test/py/bazel/bzlmod/bazel_overrides_test.py
@@ -400,7 +400,7 @@ def testCmdAbsoluteModuleOverride(self):
             'bazel_dep(name = "ss", version = "1.0")',
             'local_path_override(',
             '  module_name = "ss",',
-            '  path = "%s",' % self.Path('aa'),
+            '  path = "%s",' % self.Path('aa').replace('\\', '/'),
             ')',
         ],
     )

diff --git a/src/test/py/bazel/py_test.py b/src/test/py/bazel/py_test.py
@@ -28,8 +28,9 @@ def createSimpleFiles(self):
         'a/BUILD',
         [
             'py_binary(name="a", srcs=["a.py"], deps=[":b"])',
-            'py_library(name="b", srcs=["b.py"])',
-        ])
+            'py_library(name="b", srcs=["b.py"], imports=["."])',
+        ],
+    )
 
     self.ScratchFile(
         'a/a.py',

diff --git a/src/test/py/bazel/test_base.py b/src/test/py/bazel/test_base.py
@@ -577,7 +577,7 @@ def RunProgram(
         ]
 
         if not allow_failure:
-          self.AssertExitCode(exit_code, 0, stderr_lines)
+          self.AssertExitCode(exit_code, 0, stderr_lines, stdout_lines)
 
         return exit_code, stdout_lines, stderr_lines