Reduce shell test flakiness.

fweikert · copybara-github · commit a737169fe6de · 2024-05-29T03:07:41.000-07:00
We've seen an increasing number of flakes due to a) transient network issues and b) the fact that a subset of CI workers has an /etc/bazel.bazelrc file.
This change addresses both issues by disabling bzlmod (thus avoiding any requests to BCR) and by filtering out irrelevant log entries.

PiperOrigin-RevId: 638217146
Change-Id: I525a3abcdc824a40aba602d57b0b51f51c94a695
diff --git a/src/test/shell/integration/bazel_command_log_test.sh b/src/test/shell/integration/bazel_command_log_test.sh
@@ -21,6 +21,9 @@ source "${CURRENT_DIR}/../integration_test_setup.sh" \
 
 log="$(bazel --batch info command_log)"
 
+# Less network flakiness without bzlmod
+disable_bzlmod
+
 function tear_down() {
   # Clean up after ourselves.
   bazel --nobatch shutdown
@@ -46,6 +49,8 @@ function strip_lines_from_bazel_cc() {
     -e '/^WARNING: The startup option --host_javabase is deprecated; prefer --server_javabase.$/d' \
     -e '/^WARNING: The home directory is not defined, no home_rc will be looked for.$/d' \
     -e '/^WARNING: ignoring JAVA_TOOL_OPTIONS in environment.$/d' \
+    -e '/^WARNING: The following rc files are no longer being read, please transfer their contents or import their path into one of the standard rc files:$/d' \
+    -e '/^\/etc\/bazel.bazelrc$/d' \
     -e '/Options -Xverify:none and -noverify were deprecated in JDK 13 and will likely be removed in a future release/d' \
     -e '/^E[0-9]* /d' \
     $TEST_log)
diff --git a/src/test/shell/integration/client_test.sh b/src/test/shell/integration/client_test.sh
@@ -19,6 +19,23 @@ CURRENT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 source "${CURRENT_DIR}/../integration_test_setup.sh" \
   || { echo "integration_test_setup.sh not found!" >&2; exit 1; }
 
+# Less network flakiness without bzlmod
+disable_bzlmod
+
+function strip_lines_from_bazel_cc() {
+  # sed can't redirect back to its input file (it'll only generate an empty
+  # file). In newer versions of gnu sed there is a -i option to edit in place.
+
+  # Ignore common warnings caused by the environment on our CI workers.
+  clean_log=$(\
+    sed \
+    -e '/^WARNING: ignoring JAVA_TOOL_OPTIONS in environment.$/d' \
+    -e '/^WARNING: The following rc files are no longer being read, please transfer their contents or import their path into one of the standard rc files:$/d' \
+    -e '/^\/etc\/bazel.bazelrc$/d' \
+    $TEST_log)
+
+  echo "$clean_log" > $TEST_log
+}
 
 #### TESTS #############################################################
 
@@ -422,19 +439,31 @@ function test_client_is_quiet_by_default() {
 
   bazel info server_pid > stdout 2> stderr || fail "bazel info failed"
   cp stderr $TEST_log || fail "cp failed"
+
+  strip_lines_from_bazel_cc
+
   assert_equals 2 $(cat $TEST_log | wc -l)
   expect_log "^\$TEST_TMPDIR defined: output root default"
   expect_log "^Starting local $capitalized_product_name server and connecting to it...$"
   cp stdout $TEST_log || fail "cp failed"
+
+  strip_lines_from_bazel_cc
+
   assert_equals 1 $(cat $TEST_log | wc -l)
   expect_log "^[0-9]\+$"
 
   rm stderr stdout || fail "rm failed"
   bazel info server_pid > stdout 2> stderr || fail "bazel info failed"
   cp stderr $TEST_log || fail "cp failed"
+
+  strip_lines_from_bazel_cc
+
   assert_equals 1 $(cat $TEST_log | wc -l)
   expect_log "^\$TEST_TMPDIR defined: output root default"
   cp stdout $TEST_log || fail "cp failed"
+
+  strip_lines_from_bazel_cc
+
   assert_equals 1 $(cat $TEST_log | wc -l)
   expect_log "^[0-9]\+$"
 }
