Merge cockroachdb#108220

108220: acceptance: unskip test_missing_log_output with fix r=abarganier,knz a=dhartunian Previously, this test would pass infrequently due to a failed interrupt in the script. This change adds a second interrupt to ensure that the cockroach process has shut down. The second interrupt is necessary in order to force the override of graceful shutdown and terminate the node. Other parts of the test using `start_server` and `stop_server` have their own shutdown code. Resolves: cockroachdb#107122 Epic: None Release note: None Co-authored-by: David Hartunian <[email protected]>
DarrylWong · Aug 8, 2023 · 1382b26 · 1382b26
2 parents bf7e23f + c78dacd
commit 1382b26
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/pkg/acceptance/generated_cli_test.go b/pkg/acceptance/generated_cli_test.go
diff --git a/...ests/test_missing_log_output.tcl.disabled → ...ractive_tests/test_missing_log_output.tcl b/...ests/test_missing_log_output.tcl.disabled → ...ractive_tests/test_missing_log_output.tcl
@@ -1,7 +1,5 @@
 #! /usr/bin/env expect -f
 
-# disabled until #107122 is resolved.
-
 source [file join [file dirname $argv0] common.tcl]
 
 spawn /bin/bash
@@ -71,6 +69,7 @@ end_test
 
 # Stop it.
 interrupt
+interrupt
 eexpect ":/# "
 
 start_test "Check that --logtostderr can override the threshold but no error is printed on startup"
@@ -80,6 +79,7 @@ end_test
 
 # Stop it.
 interrupt
+interrupt
 eexpect ":/# "
 
 start_test "Check that panic reports are printed to the log even when --logtostderr is specified"