From 7291b9f95830f31bd122b48abe8df122a1527174 Mon Sep 17 00:00:00 2001 From: Fabian Meumertzheim Date: Thu, 22 Aug 2024 12:45:31 +0200 Subject: [PATCH] Fix tests --- .../bzlmod/ModuleExtensionResolutionTest.java | 16 ++++++++-------- src/test/py/bazel/bzlmod/bazel_module_test.py | 2 +- 2 files changed, 9 insertions(+), 9 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 761270682044cd..340a7fb3184113 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 @@ -1384,8 +1384,8 @@ public void invalidAttributeValue() throws Exception { evaluator.evaluate(ImmutableList.of(skyKey), evaluationContext); assertThat(result.hasError()).isTrue(); assertContainsEvent( - "ERROR /ws/defs.bzl:3:12: //:+ext+ext: expected value of type 'string' for attribute 'data'" - + " of 'data_repo', but got 42 (int)"); + "ERROR /ws/defs.bzl:3:12: //:_main~ext~ext: expected value of type 'string' for attribute 'data'" + + " in 'data_repo' rule, but got 42 (int)"); assertThat(result.getError().getException()) .hasMessageThat() .isEqualTo("error evaluating module extension ext in //:defs.bzl"); @@ -2976,14 +2976,14 @@ public void innate_invalidAttributeValue() throws Exception { "module(name='foo',version='1.0')", "data_repo = use_repo_rule('//:repo.bzl', 'data_repo')", "data_repo(name='data', data='go to bed at 11pm.')"); - scratch.file(modulesRoot.getRelative("foo+1.0/WORKSPACE").getPathString()); - scratch.file(modulesRoot.getRelative("foo+1.0/BUILD").getPathString()); + scratch.file(modulesRoot.getRelative("foo~v1.0/WORKSPACE").getPathString()); + scratch.file(modulesRoot.getRelative("foo~v1.0/BUILD").getPathString()); scratch.file( - modulesRoot.getRelative("foo+1.0/data.bzl").getPathString(), + modulesRoot.getRelative("foo~v1.0/data.bzl").getPathString(), "load('@data//:data.bzl',repo_data='data')", "data=repo_data"); scratch.file( - modulesRoot.getRelative("foo+1.0/repo.bzl").getPathString(), + modulesRoot.getRelative("foo~v1.0/repo.bzl").getPathString(), "def _data_repo_impl(ctx):", " ctx.file('BUILD.bazel')", " ctx.file('data.bzl', 'data='+json.encode(ctx.attr.data))", @@ -2996,8 +2996,8 @@ public void innate_invalidAttributeValue() throws Exception { evaluator.evaluate(ImmutableList.of(skyKey), evaluationContext); assertThat(result.hasError()).isTrue(); assertContainsEvent( - "ERROR /ws/MODULE.bazel:3:10: //:+_repo_rules+data: expected value of type 'string' for" - + " attribute 'data' of 'data_repo', but got 5 (int)"); + "ERROR /ws/MODULE.bazel:3:10: //:_main~_repo_rules~data: expected value" + + " of type 'string' for attribute 'data' in 'data_repo' rule, but got 5 (int)"); assertThat(result.getError().getException()) .hasMessageThat() .isEqualTo( diff --git a/src/test/py/bazel/bzlmod/bazel_module_test.py b/src/test/py/bazel/bzlmod/bazel_module_test.py index 77d7f38aaac5ac..c861bd1a6972f4 100644 --- a/src/test/py/bazel/bzlmod/bazel_module_test.py +++ b/src/test/py/bazel/bzlmod/bazel_module_test.py @@ -267,7 +267,7 @@ def testRepositoryRuleErrorInModuleExtensionFailsTheBuild(self): self.AssertExitCode(exit_code, 48, stderr) stderr = '\n'.join(stderr) self.assertIn( - '/pkg/extension.bzl:3:14: //pkg:+module_ext+foo: no such attribute' + '/pkg/extension.bzl:3:14: //pkg:_main~module_ext~foo: no such attribute' " 'invalid_attr' in 'repo_rule' rule", stderr, )