From d0e58d26c02f5bf72f228807d3c62defc5e0cf61 Mon Sep 17 00:00:00 2001 From: Tobias Schottdorf Date: Fri, 20 Oct 2017 13:39:44 +0200 Subject: [PATCH] acceptance: de-flake test_missing_log_output ...by filtering out all GRPC log messages. Fixes #19397. Fixes #19388. --- pkg/cli/interactive_tests/test_missing_log_output.tcl | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkg/cli/interactive_tests/test_missing_log_output.tcl b/pkg/cli/interactive_tests/test_missing_log_output.tcl index 3835ade4fe69..f8eb25e90f93 100644 --- a/pkg/cli/interactive_tests/test_missing_log_output.tcl +++ b/pkg/cli/interactive_tests/test_missing_log_output.tcl @@ -76,7 +76,7 @@ start_test "Test that quit does not emit unwanted logging output" # Unwanted: between the point the command starts until it # either prints the final ok message or fails with some error # (e.g. due to no definite answer from the server). -send "echo marker; $argv quit 2>&1 | grep '^\\(\[IWEF\]\[0-9\]\\)' \r" +send "echo marker; $argv quit 2>&1 | grep -vE '^\[IWEF\]\[0-9\]+ .\* grpc: '\r" set timeout 20 eexpect "marker\r\n:/# " set timeout 5 @@ -87,11 +87,7 @@ start_test "Test that quit does not show INFO by defaults with --logtostderr" # that the default logging level is WARNING, so that no INFO messages # are printed between the marker and the (first line) error message # from quit. Quit will error out because the server is already stopped. -# -# Since quit is likely to actually emit warnings, but we are just -# interested in the absence of INFO messages, remove the warnings from -# the output. -send "echo marker; $argv quit --logtostderr 2>&1 | grep -v '^W'\r" +send "echo marker; $argv quit --logtostderr 2>&1 | grep -vE '^\[IWEF\]\[0-9\]+ .\* grpc: '\r" eexpect "marker\r\nError" eexpect ":/# " end_test