From 8e3b41a39641c730ab8a76a6ad97519ee0214676 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?X=C3=B9d=C5=8Dng=20Y=C3=A1ng?= Date: Tue, 28 Jan 2025 16:04:58 -0500 Subject: [PATCH] fix tests --- .../lib/bazel/bzlmod/ModuleExtensionResolutionTest.java | 4 ++-- .../build/lib/bazel/bzlmod/StarlarkBazelModuleTest.java | 2 +- src/test/py/bazel/bzlmod/bazel_lockfile_test.py | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/test/java/com/google/devtools/build/lib/bazel/bzlmod/ModuleExtensionResolutionTest.java b/src/test/java/com/google/devtools/build/lib/bazel/bzlmod/ModuleExtensionResolutionTest.java index 81663cbf665af6..e2519d3292aa7d 100644 --- a/src/test/java/com/google/devtools/build/lib/bazel/bzlmod/ModuleExtensionResolutionTest.java +++ b/src/test/java/com/google/devtools/build/lib/bazel/bzlmod/ModuleExtensionResolutionTest.java @@ -898,7 +898,7 @@ public void labels_passedOnToRepoRule() throws Exception { SkyKey extensionSkyKey = SingleExtensionValue.key( ModuleExtensionId.create( - Label.parseCanonicalUnchecked("@@ext+//:defs.bzl"), "ext", Optional.empty())); + Label.parseCanonicalUnchecked("@@ext~//:defs.bzl"), "ext", Optional.empty())); EvaluationResult extensionResult = evaluator.evaluate(ImmutableList.of(extensionSkyKey), evaluationContext); if (extensionResult.hasError()) { @@ -911,7 +911,7 @@ public void labels_passedOnToRepoRule() throws Exception { .get() .moduleExtension() .getRecordedRepoMappingEntries()) - .containsCell(RepositoryName.create("foo+"), "bar", RepositoryName.create("bar+")); + .containsCell(RepositoryName.create("foo~"), "bar", RepositoryName.create("bar~")); } @Test diff --git a/src/test/java/com/google/devtools/build/lib/bazel/bzlmod/StarlarkBazelModuleTest.java b/src/test/java/com/google/devtools/build/lib/bazel/bzlmod/StarlarkBazelModuleTest.java index 8b39f847a5dcdd..ff43c9610abf2e 100644 --- a/src/test/java/com/google/devtools/build/lib/bazel/bzlmod/StarlarkBazelModuleTest.java +++ b/src/test/java/com/google/devtools/build/lib/bazel/bzlmod/StarlarkBazelModuleTest.java @@ -129,7 +129,7 @@ public void basic() throws Exception { Label.parseCanonical("@@bar~//:pom.xml"))); assertThat(repoMappingRecorder.recordedEntries()) - .containsCell(RepositoryName.create("foo+"), "bar", RepositoryName.create("bar+")); + .containsCell(RepositoryName.create("foo~"), "bar", RepositoryName.create("bar~")); } @Test diff --git a/src/test/py/bazel/bzlmod/bazel_lockfile_test.py b/src/test/py/bazel/bzlmod/bazel_lockfile_test.py index 7d6096dafb7f45..a823fad6e90cd8 100644 --- a/src/test/py/bazel/bzlmod/bazel_lockfile_test.py +++ b/src/test/py/bazel/bzlmod/bazel_lockfile_test.py @@ -1925,7 +1925,7 @@ def testExtensionRepoMappingChange_tag(self): ) _, _, stderr = self.RunBazel(['build', ':lol']) - self.assertIn('STR=@@foo+//:lib_foo', '\n'.join(stderr)) + self.assertIn('STR=@@foo~//:lib_foo', '\n'.join(stderr)) # Shutdown bazel to make sure we rely on the lockfile and not skyframe self.RunBazel(['shutdown']) @@ -1950,7 +1950,7 @@ def testExtensionRepoMappingChange_tag(self): _, _, stderr = self.RunBazel(['build', ':lol']) stderr = '\n'.join(stderr) self.assertIn('ran the extension!', stderr) - self.assertIn('STR=@@bar+//:lib_foo', stderr) + self.assertIn('STR=@@bar~//:lib_foo', stderr) # Shutdown bazel to make sure we rely on the lockfile and not skyframe self.RunBazel(['shutdown']) @@ -1970,7 +1970,7 @@ def testExtensionRepoMappingChange_tag(self): _, _, stderr = self.RunBazel(['build', ':lol']) stderr = '\n'.join(stderr) self.assertNotIn('ran the extension!', stderr) - self.assertIn('STR=@@bar+//:lib_foo', stderr) + self.assertIn('STR=@@bar~//:lib_foo', stderr) def testExtensionRepoMappingChange_loadsAndRepoRelativeLabels(self): # Regression test for #20721; same test as above, except that the call to