Added ssh integration test and updated RunCommand in util.go

pull/151/head
aprindle 2016-06-01 15:26:17 -07:00
parent 07286d508e
commit 4098745500
2 changed files with 44 additions and 2 deletions

View File

@ -0,0 +1,37 @@
// +build integration
/*
Copyright 2016 The Kubernetes Authors All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
package integration
import (
"k8s.io/minikube/test/integration/util"
"strings"
"testing"
)
func TestClusterSSH(t *testing.T) {
minikubeRunner := util.MinikubeRunner{BinaryPath: *binaryPath, T: t}
minikubeRunner.RunCommand("start", true)
minikubeRunner.CheckStatus("Running")
expectedStr := "hello"
sshCmdOutput := minikubeRunner.RunCommand("ssh echo "+expectedStr, true)
if !strings.Contains(sshCmdOutput, expectedStr) {
t.Fatalf("ExpectedStr sshCmdOutput to be: %s. Output was: %s", expectedStr, sshCmdOutput)
}
}

View File

@ -35,12 +35,17 @@ type MinikubeRunner struct {
}
func (m *MinikubeRunner) RunCommand(command string, checkError bool) string {
commandArr := strings.Split(command, " ")
path, _ := filepath.Abs(m.BinaryPath)
cmd := exec.Command(path, command)
cmd := exec.Command(path, commandArr...)
stdout, err := cmd.Output()
if checkError && err != nil {
m.T.Fatalf("Error running command: %s %s. Output: %s", command, err, stdout)
if exitError, ok := err.(*exec.ExitError); ok {
m.T.Fatalf("Error running command: %s %s. Output: %s", command, exitError.Stderr, stdout)
} else {
m.T.Fatalf("Error running command: %s %s. Output: %s", command, err, stdout)
}
}
return string(stdout)
}