lzc256
/
tailscale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tstest/integration: fix running with -verbose-tailscale 

Without this fix, any run with -verbose-tailscale fails.

Signed-off-by: Josh Bleecher Snyder <josh@tailscale.com>
pull/3546/head
Josh Bleecher Snyder 2021-12-03 14:29:54 -08:00 committed by Josh Bleecher Snyder
parent c8829b742b
commit a5235e165c
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tstest/integration/integration_test.go
View File

@ -700,8 +700,11 @@ func (n *testNode) MustUp(extraArgs ...string) {
"--login-server=" + n.env.ControlServer.URL, "--login-server=" + n.env.ControlServer.URL,
} }
args = append(args, extraArgs...) args = append(args, extraArgs...)
t.Logf("Running %v ...", args) cmd := n.Tailscale(args...)
if b, err := n.Tailscale(args...).CombinedOutput(); err != nil { t.Logf("Running %v ...", cmd)
cmd.Stdout = nil // in case --verbose-tailscale was set
cmd.Stderr = nil // in case --verbose-tailscale was set
if b, err := cmd.CombinedOutput(); err != nil {
t.Fatalf("up: %v, %v", string(b), err) t.Fatalf("up: %v, %v", string(b), err)
} }
} }