From c342d8fc1209b09ef406c0e265a47b0dcc9ceb3c Mon Sep 17 00:00:00 2001 From: Matt Liggett Date: Fri, 15 Jul 2016 16:29:41 -0700 Subject: [PATCH] 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. --- hack/e2e.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/hack/e2e.go b/hack/e2e.go index b313434eb3..869da29e36 100644 --- a/hack/e2e.go +++ b/hack/e2e.go @@ -193,14 +193,13 @@ func Test() bool { ValidateClusterSize() } - if os.Getenv("FEDERATION") == "" { - return finishRunning("Ginkgo tests", exec.Command(filepath.Join(*root, "hack/ginkgo-e2e.sh"), strings.Fields(*testArgs)...)) - } else { - + if os.Getenv("FEDERATION") == "true" { if *testArgs == "" { *testArgs = "--ginkgo.focus=\\[Feature:Federation\\]" } 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)...)) } }