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

cmd/tailscale/cli: fix TestUpdatePrefs over Tailscale SSH (#7374) 

Fixes #7373

Signed-off-by: Jordan Whited <jordan@tailscale.com>
pull/7375/head
Jordan Whited 2023-02-24 15:26:23 -08:00 committed by GitHub
parent b0eba129e6
commit d4122c9f0a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmd/tailscale/cli/cli_test.go
View File

@ -1078,6 +1078,13 @@ func TestUpdatePrefs(t *testing.T) {
old := getSSHClientEnvVar old := getSSHClientEnvVar
getSSHClientEnvVar = func() string { return "100.100.100.100 1 1" } getSSHClientEnvVar = func() string { return "100.100.100.100 1 1" }
t.Cleanup(func() { getSSHClientEnvVar = old }) t.Cleanup(func() { getSSHClientEnvVar = old })
} else if isSSHOverTailscale() {
// The test is being executed over a "real" tailscale SSH
// session, but sshOverTailscale is unset. Make the test appear
// as if it's not over tailscale SSH.
old := getSSHClientEnvVar
getSSHClientEnvVar = func() string { return "" }
t.Cleanup(func() { getSSHClientEnvVar = old })
} }
if tt.env.goos == "" { if tt.env.goos == "" {
tt.env.goos = "linux" tt.env.goos = "linux"