From 55dc6f67d3b7a115b13fead76f073e7ab89e9a03 Mon Sep 17 00:00:00 2001 From: Lantao Liu Date: Sun, 17 Sep 2017 04:02:16 +0000 Subject: [PATCH] Let local node e2e return error. Signed-off-by: Lantao Liu --- test/e2e_node/runner/local/run_local.go | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/test/e2e_node/runner/local/run_local.go b/test/e2e_node/runner/local/run_local.go index 0d89f83aaaa..07085e17de3 100644 --- a/test/e2e_node/runner/local/run_local.go +++ b/test/e2e_node/runner/local/run_local.go @@ -57,16 +57,18 @@ func main() { ginkgo := filepath.Join(outputDir, "ginkgo") test := filepath.Join(outputDir, "e2e_node.test") - if *systemSpecName == "" { - runCommand(ginkgo, *ginkgoFlags, test, "--", *testFlags) - return + args := []string{*ginkgoFlags, test, "--", *testFlags} + if *systemSpecName != "" { + rootDir, err := builder.GetK8sRootDir() + if err != nil { + glog.Fatalf("Failed to get k8s root directory: %v", err) + } + systemSpecFile := filepath.Join(rootDir, systemSpecPath, *systemSpecName+".yaml") + args = append(args, fmt.Sprintf("--system-spec-name=%s --system-spec-file=%s", *systemSpecName, systemSpecFile)) } - rootDir, err := builder.GetK8sRootDir() - if err != nil { - glog.Fatalf("Failed to get k8s root directory: %v", err) + if err := runCommand(ginkgo, args...); err != nil { + glog.Exitf("Test failed: %v", err) } - systemSpecFile := filepath.Join(rootDir, systemSpecPath, *systemSpecName+".yaml") - runCommand(ginkgo, *ginkgoFlags, test, "--", fmt.Sprintf("--system-spec-name=%s --system-spec-file=%s", *systemSpecName, systemSpecFile), *testFlags) return }