Fix tctl test timeouts (#24218)

gravitational · Apr 6, 2023 · b24ebf1 · b24ebf1
1 parent 2693492
commit b24ebf1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/tool/tctl/common/helpers_test.go b/tool/tctl/common/helpers_test.go
@@ -192,6 +192,13 @@ func makeAndRunTestAuthServer(t *testing.T, opts ...testServerOptionFunc) (auth
 	// timeout here because this isn't the kind of problem that this test is meant to catch.
 	require.NoError(t, err, "auth server didn't start after 30s")
 
+	// Wait for proxy to start up if it's enabled. Otherwise we may get racy
+	// behavior between startup and shutdown.
+	if cfg.Proxy.Enabled {
+		_, err = auth.WaitForEventTimeout(30*time.Second, service.ProxyWebServerReady)
+		require.NoError(t, err, "proxy server didn't start after 30s")
+	}
+
 	return auth
 }
 

diff --git a/tool/tctl/common/resource_command_test.go b/tool/tctl/common/resource_command_test.go
@@ -204,6 +204,9 @@ func TestAppResource(t *testing.T) {
 	fileConfig := &config.FileConfig{
 		Global: config.Global{
 			DataDir: t.TempDir(),
+			Logger: config.Log{
+				Severity: "debug",
+			},
 		},
 		Apps: config.Apps{
 			Service: config.Service{