diff options
| author |  skainswo <skainswo@google.com> | 2018-08-10 11:20:07 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-08-10 11:22:01 -0700 |
| commit | 6a118a6c1ccbe3e436e8a87340a8cc554c9cc0a0 (patch) | |
| tree | 22a3c95f1d55d536beba593583e47c9f327d1c9a /src/test/shell/integration | |
| parent | 930119a70d1024f8d1697582ae2c46292cdfe409 (diff) | |
Add more detailed reporting of the differences between startup options.
This changes the logging logic slightly to support diffing startup options between different runs that have different numbers of args.
RELNOTES: Add more detailed reporting of the differences between startup options.
PiperOrigin-RevId: 208239665
Diffstat (limited to 'src/test/shell/integration')
| -rwxr-xr-x | src/test/shell/integration/client_test.sh | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/test/shell/integration/client_test.sh b/src/test/shell/integration/client_test.sh index 021b30b11d..1676d8ed19 100755 --- a/src/test/shell/integration/client_test.sh +++ b/src/test/shell/integration/client_test.sh @@ -90,7 +90,10 @@ function test_server_restart_due_to_startup_options_with_client_debug_informatio local server_pid2=$(bazel --client_debug --nowrite_command_log info server_pid 2>$TEST_log) assert_not_equals "$server_pid1" "$server_pid2" # pid changed. expect_log "\\[bazel WARNING .*\\] Running B\\(azel\\|laze\\) server needs to be killed" - expect_log "\\[bazel INFO .*\\] .* the running server has option --write_command_log, and requested option is: --nowrite_command_log" + expect_log "\\[bazel INFO .*\\] Args from the running server that are not included in the current request:" + expect_log "\\[bazel INFO .*\\] --write_command_log" + expect_log "\\[bazel INFO .*\\] Args from the current request that were not included when creating the server:" + expect_log "\\[bazel INFO .*\\] --nowrite_command_log" } function test_exit_code() { |