From 9e70daad6f4d9d6f357a72539a05b6563b04b3d6 Mon Sep 17 00:00:00 2001 From: Maisem Ali Date: Sat, 12 Nov 2022 19:11:04 +0500 Subject: [PATCH] ipn/ipnlocal: make TKA tests not have side effects It left the envknob turned on which meant that running all the tests in the package had different behavior than running just any one test. Signed-off-by: Maisem Ali --- ipn/ipnlocal/network-lock_test.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ipn/ipnlocal/network-lock_test.go b/ipn/ipnlocal/network-lock_test.go index a60d3a1f4..88e45a102 100644 --- a/ipn/ipnlocal/network-lock_test.go +++ b/ipn/ipnlocal/network-lock_test.go @@ -67,6 +67,7 @@ func fakeNoiseServer(t *testing.T, handler http.HandlerFunc) (*httptest.Server, func TestTKAEnablementFlow(t *testing.T) { envknob.Setenv("TAILSCALE_USE_WIP_CODE", "1") + defer envknob.Setenv("TAILSCALE_USE_WIP_CODE", "") nodePriv := key.NewNode() // Make a fake TKA authority, getting a usable genesis AUM which @@ -149,6 +150,7 @@ func TestTKAEnablementFlow(t *testing.T) { func TestTKADisablementFlow(t *testing.T) { envknob.Setenv("TAILSCALE_USE_WIP_CODE", "1") + defer envknob.Setenv("TAILSCALE_USE_WIP_CODE", "") temp := t.TempDir() os.Mkdir(filepath.Join(temp, "tka"), 0755) nodePriv := key.NewNode() @@ -265,6 +267,7 @@ func TestTKADisablementFlow(t *testing.T) { func TestTKASync(t *testing.T) { envknob.Setenv("TAILSCALE_USE_WIP_CODE", "1") + defer envknob.Setenv("TAILSCALE_USE_WIP_CODE", "") someKeyPriv := key.NewNLPrivate() someKey := tka.Key{Kind: tka.Key25519, Public: someKeyPriv.Public().Verifier(), Votes: 1} @@ -501,6 +504,7 @@ func TestTKASync(t *testing.T) { func TestTKAFilterNetmap(t *testing.T) { envknob.Setenv("TAILSCALE_USE_WIP_CODE", "1") + defer envknob.Setenv("TAILSCALE_USE_WIP_CODE", "") nlPriv := key.NewNLPrivate() nlKey := tka.Key{Kind: tka.Key25519, Public: nlPriv.Public().Verifier(), Votes: 2} @@ -559,6 +563,7 @@ func TestTKAFilterNetmap(t *testing.T) { func TestTKADisable(t *testing.T) { envknob.Setenv("TAILSCALE_USE_WIP_CODE", "1") + defer envknob.Setenv("TAILSCALE_USE_WIP_CODE", "") temp := t.TempDir() os.Mkdir(filepath.Join(temp, "tka"), 0755) nodePriv := key.NewNode() @@ -647,6 +652,7 @@ func TestTKADisable(t *testing.T) { func TestTKASign(t *testing.T) { envknob.Setenv("TAILSCALE_USE_WIP_CODE", "1") + defer envknob.Setenv("TAILSCALE_USE_WIP_CODE", "") temp := t.TempDir() os.Mkdir(filepath.Join(temp, "tka"), 0755) nodePriv := key.NewNode()