Only run federation tests if FEDERATION==true.

This is the same test we make everywhere else.  Only here were we
checking against the empty string.
This commit is contained in:
Matt Liggett 2016-07-15 16:29:41 -07:00
parent e576a2f760
commit c342d8fc12

View File

@ -193,14 +193,13 @@ func Test() bool {
ValidateClusterSize() ValidateClusterSize()
} }
if os.Getenv("FEDERATION") == "" { if os.Getenv("FEDERATION") == "true" {
return finishRunning("Ginkgo tests", exec.Command(filepath.Join(*root, "hack/ginkgo-e2e.sh"), strings.Fields(*testArgs)...))
} else {
if *testArgs == "" { if *testArgs == "" {
*testArgs = "--ginkgo.focus=\\[Feature:Federation\\]" *testArgs = "--ginkgo.focus=\\[Feature:Federation\\]"
} }
return finishRunning("Federated Ginkgo tests", exec.Command(filepath.Join(*root, "hack/federated-ginkgo-e2e.sh"), strings.Fields(*testArgs)...)) return finishRunning("Federated Ginkgo tests", exec.Command(filepath.Join(*root, "hack/federated-ginkgo-e2e.sh"), strings.Fields(*testArgs)...))
} else {
return finishRunning("Ginkgo tests", exec.Command(filepath.Join(*root, "hack/ginkgo-e2e.sh"), strings.Fields(*testArgs)...))
} }
} }