From 821e6ec2a72b8453813923ac71d1c54f8aef91a8 Mon Sep 17 00:00:00 2001 From: Jeff Grafton Date: Thu, 30 Jun 2016 11:25:40 -0700 Subject: [PATCH] Make node e2e exit nonzero on test failures --- test/e2e_node/e2e_remote.go | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/test/e2e_node/e2e_remote.go b/test/e2e_node/e2e_remote.go index c07484c3689..e7617c75cde 100644 --- a/test/e2e_node/e2e_remote.go +++ b/test/e2e_node/e2e_remote.go @@ -226,14 +226,11 @@ func RunRemote(archive string, host string, cleanup bool, junitFileNumber int, s glog.Infof("Copying test artifacts from %s", host) scpErr := getTestArtifacts(host, tmp) - exitOk := true if scpErr != nil { - // Only exit non-0 if the scp failed - exitOk = false - aggErrs = append(aggErrs, err) + aggErrs = append(aggErrs, scpErr) } - return output, exitOk, utilerrors.NewAggregate(aggErrs) + return output, len(aggErrs) == 0, utilerrors.NewAggregate(aggErrs) } func getTestArtifacts(host, testDir string) error {