seg_yinzy
/
che-operator
mirror of https://github.com/eclipse-che/che-operator.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix test cases to accomodate using workspaceID in router name 

Signed-off-by: Angel Misevski <amisevsk@redhat.com>
pull/1316/head
Angel Misevski 2022-02-02 14:47:58 -05:00 committed by Florent BENOIT
parent 44d610dd9c
commit 9a6b62f51d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
controllers/devworkspace/solver/che_routing_test.go
View File

@ -331,7 +331,7 @@ func TestCreateRelocatedObjectsK8S(t *testing.T) {
} }
t.Run("testHealthzEndpointInMainWorkspaceRoute", func(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.Contains(t, workspaceMainConfig.HTTP.Routers, healthzName)
assert.Equal(t, workspaceMainConfig.HTTP.Routers[healthzName].Service, wsid) assert.Equal(t, workspaceMainConfig.HTTP.Routers[healthzName].Service, wsid)
assert.Equal(t, workspaceMainConfig.HTTP.Routers[healthzName].Rule, "Path(`/wsid/m1/9999/healthz`)") 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) { t.Run("testHealthzEndpointInMainWorkspaceRoute", func(t *testing.T) {
healthzName := "9999-healthz" healthzName := "wsid-9999-healthz"
assert.Contains(t, workspaceMainConfig.HTTP.Routers, healthzName) assert.Contains(t, workspaceMainConfig.HTTP.Routers, healthzName)
assert.Equal(t, workspaceMainConfig.HTTP.Routers[healthzName].Service, wsid) assert.Equal(t, workspaceMainConfig.HTTP.Routers[healthzName].Service, wsid)
assert.Equal(t, workspaceMainConfig.HTTP.Routers[healthzName].Rule, "Path(`/wsid/m1/9999/healthz`)") 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)) assert.NoError(t, yaml.Unmarshal([]byte(traefikMainWorkspaceConfig), &workspaceMainConfig))
t.Run("testHealthzEndpointInMainWorkspaceRoute", func(t *testing.T) { t.Run("testHealthzEndpointInMainWorkspaceRoute", func(t *testing.T) {
healthzName := "e1-healthz" healthzName := wsid + "-e1-healthz"
assert.Contains(t, workspaceMainConfig.HTTP.Routers, healthzName) assert.Contains(t, workspaceMainConfig.HTTP.Routers, healthzName)
assert.Equal(t, workspaceMainConfig.HTTP.Routers[healthzName].Service, wsid) assert.Equal(t, workspaceMainConfig.HTTP.Routers[healthzName].Service, wsid)
assert.Equal(t, workspaceMainConfig.HTTP.Routers[healthzName].Rule, "Path(`/"+wsid+"/m1/e1/healthz`)") assert.Equal(t, workspaceMainConfig.HTTP.Routers[healthzName].Rule, "Path(`/"+wsid+"/m1/e1/healthz`)")