]> Cypherpunks repositories - gostls13.git/commitdiff
os/signal: disable loading of history during test
authorAndrey Mirtchovski <mirtchovski@gmail.com>
Mon, 5 Mar 2018 20:04:25 +0000 (20:04 +0000)
committerBrad Fitzpatrick <bradfitz@golang.org>
Mon, 5 Mar 2018 21:03:33 +0000 (21:03 +0000)
This change modifies Go to disable loading of users' shell history for
TestTerminalSignal tests. TestTerminalSignal, as part of its workload,
will execute a new interactive bash shell. Bash will attempt to load the
user's history from the file pointed to by the HISTFILE environment
variable. For users with large histories that may take up to several
seconds, pushing the whole test past the 5 second timeout and causing
it to fail.

Change-Id: I11b2f83ee91f51fa1e9774a39181ab365f9a6b3a
GitHub-Last-Rev: 7efdf616a2fcecdf479420fc0004057cee2ea6b2
GitHub-Pull-Request: golang/go#24255
Reviewed-on: https://go-review.googlesource.com/98616
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
src/os/signal/signal_cgo_test.go

index 84a2a08ce9b6e5a11e072f581b72cbc890e40414..16aeea8221cdcb89d16c1a442aac3da8b31caefc 100644 (file)
@@ -89,6 +89,8 @@ func TestTerminalSignal(t *testing.T) {
        ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
        defer cancel()
        cmd := exec.CommandContext(ctx, bash, "--norc", "--noprofile", "-i")
+       // Clear HISTFILE so that we don't read or clobber the user's bash history.
+       cmd.Env = append(os.Environ(), "HISTFILE=")
        cmd.Stdin = slave
        cmd.Stdout = slave
        cmd.Stderr = slave