mirror of https://github.com/k3s-io/k3s
Test() was mis-tracked. Change the variable name / handling here, and
also just make it unset so that if it's ever uninitialized it's obvious. Fixes #4177pull/6/head
parent
6c15604ccb
commit
ab38a78d70
|
@ -146,21 +146,21 @@ func main() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
failure := false
|
success := true
|
||||||
switch {
|
switch {
|
||||||
case *ctlCmd != "":
|
case *ctlCmd != "":
|
||||||
ctlArgs := strings.Fields(*ctlCmd)
|
ctlArgs := strings.Fields(*ctlCmd)
|
||||||
os.Setenv("KUBE_CONFIG_FILE", "config-test.sh")
|
os.Setenv("KUBE_CONFIG_FILE", "config-test.sh")
|
||||||
failure = !finishRunning("'kubectl "+*ctlCmd+"'", exec.Command(path.Join(versionRoot, "cluster/kubectl.sh"), ctlArgs...))
|
success = finishRunning("'kubectl "+*ctlCmd+"'", exec.Command(path.Join(versionRoot, "cluster/kubectl.sh"), ctlArgs...))
|
||||||
case *test:
|
case *test:
|
||||||
failure = Test()
|
success = Test()
|
||||||
}
|
}
|
||||||
|
|
||||||
if *down {
|
if *down {
|
||||||
TearDown()
|
TearDown()
|
||||||
}
|
}
|
||||||
|
|
||||||
if failure {
|
if !success {
|
||||||
os.Exit(1)
|
os.Exit(1)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue