Reuse new test helpers.

gravitational · Jan 30, 2025 · 5c887d6 · 5c887d6
1 parent bebaeb9
commit 5c887d6
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 34 deletions.
diff --git a/integration/web/web_test.go b/integration/web/web_test.go
@@ -72,7 +72,6 @@ func TestMFAAuthenticateChallenge_IsMFARequiredApp(t *testing.T) {
 		testserver.WithTestApp(t, "root-app"),
 		testserver.WithTestApp(t, "root-app-mfa"),
 		testserver.WithConfig(func(cfg *servicecfg.Config) {
-			cfg.Auth.NetworkingConfig.SetProxyListenerMode(types.ProxyListenerMode_Multiplex)
 			cfg.SSH.Enabled = false
 			cfg.Auth.Preference = &types.AuthPreferenceV2{
 				Metadata: types.Metadata{
@@ -98,8 +97,6 @@ func TestMFAAuthenticateChallenge_IsMFARequiredApp(t *testing.T) {
 		testserver.WithTestApp(t, "leaf-app-mfa"),
 		testserver.WithConfig(func(cfg *servicecfg.Config) {
 			cfg.SSH.Enabled = false
-			cfg.Apps.Enabled = true
-			cfg.Apps.DebugApp = true
 		}),
 	)
 	leafAuth := leafServer.GetAuthServer()

diff --git a/tool/teleport/testenv/test_server.go b/tool/teleport/testenv/test_server.go
@@ -412,7 +412,7 @@ func WithProxyKube(t *testing.T) TestServerOptFunc {
 }
 
 // WithDebugApp enables the app service and the debug app.
-func WithDebugApp(t *testing.T) TestServerOptFunc {
+func WithDebugApp() TestServerOptFunc {
 	return WithConfig(func(cfg *servicecfg.Config) {
 		cfg.Apps.Enabled = true
 		cfg.Apps.DebugApp = true

diff --git a/tool/tsh/common/app_test.go b/tool/tsh/common/app_test.go
@@ -99,15 +99,9 @@ func TestAppCommands(t *testing.T) {
 	rootServerOpts := []testserver.TestServerOptFunc{
 		testserver.WithBootstrap(connector, accessUser),
 		testserver.WithClusterName(t, "root"),
+		testserver.WithTestApp(t, "rootapp"),
 		testserver.WithConfig(func(cfg *servicecfg.Config) {
 			cfg.Auth.NetworkingConfig.SetProxyListenerMode(types.ProxyListenerMode_Multiplex)
-			cfg.Apps = servicecfg.AppsConfig{
-				Enabled: true,
-				Apps: []servicecfg.App{{
-					Name: "rootapp",
-					URI:  startDummyHTTPServer(t, "rootapp"),
-				}},
-			}
 		}),
 	}
 	rootServer := testserver.MakeTestServer(t, rootServerOpts...)
@@ -124,15 +118,9 @@ func TestAppCommands(t *testing.T) {
 	leafServerOpts := []testserver.TestServerOptFunc{
 		testserver.WithBootstrap(accessUser),
 		testserver.WithClusterName(t, "leaf"),
+		testserver.WithTestApp(t, "leafapp"),
 		testserver.WithConfig(func(cfg *servicecfg.Config) {
 			cfg.Auth.NetworkingConfig.SetProxyListenerMode(types.ProxyListenerMode_Multiplex)
-			cfg.Apps = servicecfg.AppsConfig{
-				Enabled: true,
-				Apps: []servicecfg.App{{
-					Name: "leafapp",
-					URI:  startDummyHTTPServer(t, "leafapp"),
-				}},
-			}
 		}),
 	}
 	leafServer := testserver.MakeTestServer(t, leafServerOpts...)

diff --git a/tool/tsh/common/proxy_test.go b/tool/tsh/common/proxy_test.go
@@ -1482,19 +1482,10 @@ func TestProxyAppWithIdentity(t *testing.T) {
 		userName    = "admin"
 	)
 
-	appURI := startDummyHTTPServer(t, appName)
-
 	rootServerOpts := []testserver.TestServerOptFunc{
 		testserver.WithClusterName(t, clusterName),
+		testserver.WithTestApp(t, appName),
 		testserver.WithConfig(func(cfg *servicecfg.Config) {
-			cfg.Auth.NetworkingConfig.SetProxyListenerMode(types.ProxyListenerMode_Multiplex)
-			cfg.Apps = servicecfg.AppsConfig{
-				Enabled: true,
-				Apps: []servicecfg.App{{
-					Name: appName,
-					URI:  appURI,
-				}},
-			}
 		}),
 	}
 	process := testserver.MakeTestServer(t, rootServerOpts...)

diff --git a/tool/tsh/common/tsh_test.go b/tool/tsh/common/tsh_test.go
@@ -6029,6 +6029,7 @@ func TestListingResourcesAcrossClusters(t *testing.T) {
 		testserver.WithBootstrap(connector, accessUser),
 		testserver.WithHostname("node01"),
 		testserver.WithClusterName(t, "root"),
+		testserver.WithDebugApp(),
 		testserver.WithConfig(func(cfg *servicecfg.Config) {
 			// Enable DB
 			cfg.Databases.Enabled = true
@@ -6039,9 +6040,6 @@ func TestListingResourcesAcrossClusters(t *testing.T) {
 					URI:      "localhost:5432",
 				},
 			}
-
-			cfg.Apps.Enabled = true
-			cfg.Apps.DebugApp = true
 		}),
 	}
 	rootServer := testserver.MakeTestServer(t, rootServerOpts...)
@@ -6050,6 +6048,7 @@ func TestListingResourcesAcrossClusters(t *testing.T) {
 		testserver.WithBootstrap(connector, accessUser),
 		testserver.WithHostname("node02"),
 		testserver.WithClusterName(t, "leaf"),
+		testserver.WithDebugApp(),
 		testserver.WithConfig(func(cfg *servicecfg.Config) {
 			// Enable DB
 			cfg.Databases.Enabled = true
@@ -6060,9 +6059,6 @@ func TestListingResourcesAcrossClusters(t *testing.T) {
 					URI:      "localhost:5432",
 				},
 			}
-
-			cfg.Apps.Enabled = true
-			cfg.Apps.DebugApp = true
 		}),
 	}
 	leafServer := testserver.MakeTestServer(t, leafServerOpts...)