Skip to content

Commit

Permalink
Fix unit tests
Browse files Browse the repository at this point in the history
Signed-off-by: Pavol Loffay <[email protected]>
  • Loading branch information
pavolloffay committed Feb 20, 2020
1 parent e9dce7a commit 6f49d88
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
4 changes: 3 additions & 1 deletion pkg/strategy/all_in_one_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ import (
"strings"
"testing"

"github.com/jaegertracing/jaeger-operator/pkg/util"

"github.com/spf13/viper"
"github.com/stretchr/testify/assert"
"k8s.io/apimachinery/pkg/types"
Expand Down Expand Up @@ -110,7 +112,7 @@ func assertDeploymentsAndServicesForAllInOne(t *testing.T, name string, s S, has
ingresses := map[string]bool{}
routes := map[string]bool{}
if viper.GetString("platform") == v1.FlagPlatformOpenShift {
routes[fmt.Sprintf("%s", name)] = false
routes[fmt.Sprintf("%s", util.DNSName(name))] = false
} else {
ingresses[fmt.Sprintf("%s-query", name)] = false
}
Expand Down
4 changes: 3 additions & 1 deletion pkg/strategy/production_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ import (
"strings"
"testing"

"github.com/jaegertracing/jaeger-operator/pkg/util"

"github.com/spf13/viper"
"github.com/stretchr/testify/assert"
corev1 "k8s.io/api/core/v1"
Expand Down Expand Up @@ -151,7 +153,7 @@ func assertDeploymentsAndServicesForProduction(t *testing.T, name string, s S, h
ingresses := map[string]bool{}
routes := map[string]bool{}
if viper.GetString("platform") == v1.FlagPlatformOpenShift {
routes[name] = false
routes[util.DNSName(name)] = false
} else {
ingresses[fmt.Sprintf("%s-query", name)] = false
}
Expand Down

0 comments on commit 6f49d88

Please sign in to comment.