diff options
| author |  Philipp Wollermann <philwo@google.com> | 2015-10-22 20:33:44 +0000 |
|---|---|---|
| committer |  John Field <jfield@google.com> | 2015-10-23 14:55:27 +0000 |
| commit | f2512bbae579886a6fe2673e1e225820725104bb (patch) | |
| tree | 2fa5db8649887561f92b19201df75112d6ba4564 /src/test/shell | |
| parent | d6722d63bb0ac8769f7fed4868620cf9a74c8005 (diff) | |
Move the check whether a repository name contains a slash to PackageIdentifier, where it actually belongs.
--
MOS_MIGRATED_REVID=106086272
Diffstat (limited to 'src/test/shell')
| -rwxr-xr-x | src/test/shell/bazel/generate_workspace_test.sh | 4 | ||||
| -rwxr-xr-x | src/test/shell/bazel/local_repository_test.sh | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/test/shell/bazel/generate_workspace_test.sh b/src/test/shell/bazel/generate_workspace_test.sh index 3ce865a4f7..d96e35e2cb 100755 --- a/src/test/shell/bazel/generate_workspace_test.sh +++ b/src/test/shell/bazel/generate_workspace_test.sh @@ -118,7 +118,7 @@ EOF assert_contains "artifact = \"blorp:glorp:1.2.3\"," ws assert_contains "repository = \"http://localhost:$fileserver_port/\"," ws - assert_contains "\"@blorp/glorp//jar\"," build + assert_contains "\"@blorp_glorp//jar\"," build } function test_invalid_pom() { @@ -209,7 +209,7 @@ EOF EOF generate_workspace -m $TEST_TMPDIR/b1 &> $TEST_log || fail "generate failed" - expect_log "xyz/b2 was defined in $TEST_TMPDIR/b2/pom.xml which isn't a repository URL" + expect_log "xyz_b2 was defined in $TEST_TMPDIR/b2/pom.xml which isn't a repository URL" assert_contains "artifact = \"xyz:b2:1.0\"," $(get_workspace_file) } diff --git a/src/test/shell/bazel/local_repository_test.sh b/src/test/shell/bazel/local_repository_test.sh index 71d0c82db7..c0c8cb5de0 100755 --- a/src/test/shell/bazel/local_repository_test.sh +++ b/src/test/shell/bazel/local_repository_test.sh @@ -921,7 +921,7 @@ local_repository( EOF bazel build @r/a//:bin &> $TEST_log && fail "expected build failure, but succeeded" - expect_log "the 'name' attribute must not contain slashes" + expect_log "workspace names may contain only A-Z, a-z, 0-9, '-', '_' and '.'" } run_suite "local repository tests" |