Remove mentions of middlemen from integration tests and update them when convenient:

lberki · copybara-github · commit a42e3fbe9339 · 2024-11-14T08:04:12.000-08:00
- test_build_python_zip_with_middleman is a reasonable test, rename it
- test_middleman_conflict also, rename it to indicate what it actually tests

RELNOTES: None.
PiperOrigin-RevId: 696524427
Change-Id: I784454e673b1f69ca124634b448134cedd9e7572
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/Runfiles.java b/src/main/java/com/google/devtools/build/lib/analysis/Runfiles.java
@@ -1084,9 +1084,6 @@ public void fingerprint(
         artifacts);
 
     emptyFilesSupplier.fingerprint(fp);
-
-    // extraMiddlemen does not affect the shape of the runfiles tree described by this instance and
-    // thus does not need to be fingerprinted.
   }
 
   /** Describes the inputs {@link #fingerprint} uses to aid describeKey() descriptions. */
diff --git a/src/test/shell/bazel/bazel_rules_test.sh b/src/test/shell/bazel/bazel_rules_test.sh
@@ -474,7 +474,7 @@ EOF
   expect_log "The number is 42"
 }
 
-function test_build_python_zip_with_middleman() {
+function test_build_python_zip_with_python_binary_as_data() {
   mkdir py
   touch py/data.txt
   cat > py/BUILD <<EOF
diff --git a/src/test/shell/bazel/workspace_test.sh b/src/test/shell/bazel/workspace_test.sh
@@ -77,8 +77,7 @@ function test_path_with_spaces() {
   bazel help &> $TEST_log || fail "Help failed"
 }
 
-# Tests for middleman conflict when using workspace repository
-function test_middleman_conflict() {
+function test_targets_with_identical_names_in_different_repos() {
   local test_repo1=$TEST_TMPDIR/repo1
   local test_repo2=$TEST_TMPDIR/repo2
 

Original file line number	Diff line number	Diff line change
`@@ -1084,9 +1084,6 @@ public void fingerprint(`
`1084`	`1084`	`artifacts);`
`1085`	`1085`
`1086`	`1086`	`emptyFilesSupplier.fingerprint(fp);`
`1087`		`-`
`1088`		`- // extraMiddlemen does not affect the shape of the runfiles tree described by this instance and`
`1089`		`- // thus does not need to be fingerprinted.`
`1090`	`1087`	`}`
`1091`	`1088`
`1092`	`1089`	`/** Describes the inputs {@link #fingerprint} uses to aid describeKey() descriptions. */`
Original file line number	Diff line number	Diff line change
`@@ -474,7 +474,7 @@ EOF`
`474`	`474`	`expect_log "The number is 42"`
`475`	`475`	`}`
`476`	`476`
`477`		`-function test_build_python_zip_with_middleman() {`
	`477`	`+function test_build_python_zip_with_python_binary_as_data() {`
`478`	`478`	`mkdir py`
`479`	`479`	`touch py/data.txt`
`480`	`480`	`cat > py/BUILD <<EOF`
Original file line number	Diff line number	Diff line change
`@@ -77,8 +77,7 @@ function test_path_with_spaces() {`
`77`	`77`	`bazel help &> $TEST_log \|\| fail "Help failed"`
`78`	`78`	`}`
`79`	`79`
`80`		`-# Tests for middleman conflict when using workspace repository`
`81`		`-function test_middleman_conflict() {`
	`80`	`+function test_targets_with_identical_names_in_different_repos() {`
`82`	`81`	`local test_repo1=$TEST_TMPDIR/repo1`
`83`	`82`	`local test_repo2=$TEST_TMPDIR/repo2`
`84`	`83`