github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #2783 from zmerlynn/IsUp 

Check if cluster is up before e2e test without -up
pull/6/head
Daniel Smith 2014-12-08 10:54:22 -08:00
parent b8aa070749 3009c88865
commit 0166649364
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hack/e2e.go
View File

@ -70,7 +70,7 @@ func main() {
if *isup {
status := 1
if runBash("get status", `$KUBECFG -server_version`) {
if IsUp() {
status = 0
log.Printf("Cluster is UP")
} else {
@ -130,12 +130,22 @@ func Up() bool {
return true
}
// Is the e2e cluster up?
func IsUp() bool {
return runBash("get status", `$KUBECFG -server_version`)
}
func tryUp() bool {
return runBash("up", path.Join(*root, "/cluster/kube-up.sh; test-setup;"))
}
func Test() (failed, passed []string) {
defer runBashUntil("watchEvents", "$KUBECTL --watch-only get events")()
if !IsUp() {
log.Fatal("Testing requested, but e2e cluster not up!")
}
// run tests!
dir, err := os.Open(filepath.Join(*root, "hack", "e2e-suite"))
if err != nil {