Skip to content

Commit 1382b26

Browse files
craig[bot]dhartunian
andcommitted
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]>
2 parents bf7e23f + c78dacd commit 1382b26

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

pkg/acceptance/generated_cli_test.go

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/cli/interactive_tests/test_missing_log_output.tcl.disabled renamed to pkg/cli/interactive_tests/test_missing_log_output.tcl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
#! /usr/bin/env expect -f
22

3-
# disabled until #107122 is resolved.
4-
53
source [file join [file dirname $argv0] common.tcl]
64

75
spawn /bin/bash
@@ -71,6 +69,7 @@ end_test
7169

7270
# Stop it.
7371
interrupt
72+
interrupt
7473
eexpect ":/# "
7574

7675
start_test "Check that --logtostderr can override the threshold but no error is printed on startup"
@@ -80,6 +79,7 @@ end_test
8079

8180
# Stop it.
8281
interrupt
82+
interrupt
8383
eexpect ":/# "
8484

8585
start_test "Check that panic reports are printed to the log even when --logtostderr is specified"

0 commit comments

Comments
 (0)