From ebdf466f6d2e5d58e371bc66c799bbffb3875741 Mon Sep 17 00:00:00 2001 From: Simon Law Date: Mon, 17 Mar 2025 12:27:31 -0700 Subject: [PATCH] fixup! cmd/tailscale: get command for printing settings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit TestGetDefaultSettings needs to start its own LocalBackend so it isn’t talking to a running tailscaled. Signed-off-by: Simon Law --- cmd/tailscale/cli/get_test.go | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/cmd/tailscale/cli/get_test.go b/cmd/tailscale/cli/get_test.go index 9dc6e6362..4974f93ea 100644 --- a/cmd/tailscale/cli/get_test.go +++ b/cmd/tailscale/cli/get_test.go @@ -10,13 +10,10 @@ import ( "io" "net" "net/http" - "os" "path/filepath" - "strconv" "testing" "tailscale.com/client/local" - "tailscale.com/clientupdate" "tailscale.com/ipn/ipnlocal" "tailscale.com/ipn/ipnserver" "tailscale.com/ipn/store/mem" @@ -135,19 +132,27 @@ func TestGetDefaultSettings(t *testing.T) { var stdout bytes.Buffer tstest.Replace[io.Writer](t, &Stdout, &stdout) + // Use a fake localClient that processes settings updates + lc := newLocalClient(t) + tstest.Replace(t, &localClient, lc) + if err := runGet(t.Context(), []string{f.Name}); err != nil { t.Fatal(err) } - var want string + want := f.DefValue switch f.Name { + case "accept-routes": + // ipn.NewPrefs sets this to true + // but tailscale up sets it on start. + want = "true" case "auto-update": - want = strconv.FormatBool(clientupdate.CanAutoUpdate()) - case "operator": - // applyImplicitPrefs will set the default operator to the current user - want = os.Getenv("USER") - default: - want = f.DefValue + // Unset by tailscale up. + want = "unset" + case "login-server": + // The default settings is empty, + // but tailscale up sets it on start. + want = "" } want += "\n"