Merge pull request #28303 from ixdy/make-node-e2e-fail

Make node e2e exit nonzero on test failures
This commit is contained in:
Daniel Smith 2016-06-30 11:55:17 -07:00 committed by GitHub
commit 3228a51f0b

View File

@ -226,14 +226,11 @@ func RunRemote(archive string, host string, cleanup bool, junitFileNumber int, s
glog.Infof("Copying test artifacts from %s", host) glog.Infof("Copying test artifacts from %s", host)
scpErr := getTestArtifacts(host, tmp) scpErr := getTestArtifacts(host, tmp)
exitOk := true
if scpErr != nil { if scpErr != nil {
// Only exit non-0 if the scp failed aggErrs = append(aggErrs, scpErr)
exitOk = false
aggErrs = append(aggErrs, err)
} }
return output, exitOk, utilerrors.NewAggregate(aggErrs) return output, len(aggErrs) == 0, utilerrors.NewAggregate(aggErrs)
} }
func getTestArtifacts(host, testDir string) error { func getTestArtifacts(host, testDir string) error {