From 9a6b62f51d0a92fba2d8bc4d5ddbc860623ce075 Mon Sep 17 00:00:00 2001 From: Angel Misevski Date: Wed, 2 Feb 2022 14:47:58 -0500 Subject: [PATCH] Fix test cases to accomodate using workspaceID in router name Signed-off-by: Angel Misevski --- controllers/devworkspace/solver/che_routing_test.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/controllers/devworkspace/solver/che_routing_test.go b/controllers/devworkspace/solver/che_routing_test.go index 74284c81f..48fe76f8b 100644 --- a/controllers/devworkspace/solver/che_routing_test.go +++ b/controllers/devworkspace/solver/che_routing_test.go @@ -331,7 +331,7 @@ func TestCreateRelocatedObjectsK8S(t *testing.T) { } t.Run("testHealthzEndpointInMainWorkspaceRoute", func(t *testing.T) { - healthzName := "9999-healthz" + healthzName := "wsid-9999-healthz" assert.Contains(t, workspaceMainConfig.HTTP.Routers, healthzName) assert.Equal(t, workspaceMainConfig.HTTP.Routers[healthzName].Service, wsid) assert.Equal(t, workspaceMainConfig.HTTP.Routers[healthzName].Rule, "Path(`/wsid/m1/9999/healthz`)") @@ -423,7 +423,7 @@ func TestCreateRelocatedObjectsOpenshift(t *testing.T) { } t.Run("testHealthzEndpointInMainWorkspaceRoute", func(t *testing.T) { - healthzName := "9999-healthz" + healthzName := "wsid-9999-healthz" assert.Contains(t, workspaceMainConfig.HTTP.Routers, healthzName) assert.Equal(t, workspaceMainConfig.HTTP.Routers[healthzName].Service, wsid) assert.Equal(t, workspaceMainConfig.HTTP.Routers[healthzName].Rule, "Path(`/wsid/m1/9999/healthz`)") @@ -499,7 +499,7 @@ func TestUniqueMainEndpoint(t *testing.T) { assert.NoError(t, yaml.Unmarshal([]byte(traefikMainWorkspaceConfig), &workspaceMainConfig)) t.Run("testHealthzEndpointInMainWorkspaceRoute", func(t *testing.T) { - healthzName := "e1-healthz" + healthzName := wsid + "-e1-healthz" assert.Contains(t, workspaceMainConfig.HTTP.Routers, healthzName) assert.Equal(t, workspaceMainConfig.HTTP.Routers[healthzName].Service, wsid) assert.Equal(t, workspaceMainConfig.HTTP.Routers[healthzName].Rule, "Path(`/"+wsid+"/m1/e1/healthz`)")