提交 ff93c6e0 编写于 作者: N Nicholas Goozeff

Fix bug in construction of mount command for testing.

Only check access time is set for windows OS.
上级 e5da4db3
......@@ -20,6 +20,7 @@ package integration
import (
"fmt"
"io"
"io/ioutil"
"os"
"path/filepath"
......@@ -49,8 +50,16 @@ func testMounting(t *testing.T) {
}
defer os.RemoveAll(tempDir)
mountCmd := fmt.Sprintf("mount %s %s:/mount-9p", minikubeRunner.MountArgs, tempDir)
cmd, _ := minikubeRunner.RunDaemon(mountCmd)
var mountCmd string
if len(minikubeRunner.MountArgs) > 0 {
mountCmd = fmt.Sprintf("mount %s %s:/mount-9p", minikubeRunner.MountArgs, tempDir)
} else {
mountCmd = fmt.Sprintf("mount %s:/mount-9p", tempDir)
}
if testing.Verbose() {
fmt.Fprintf(os.Stderr, "runing mount cmd: %s\n", mountCmd)
}
cmd, out, serr := minikubeRunner.RunDaemon2(mountCmd)
defer func() {
err := cmd.Process.Kill()
if err != nil {
......@@ -58,6 +67,11 @@ func testMounting(t *testing.T) {
}
}()
if testing.Verbose() {
go io.Copy(os.Stderr, out)
go io.Copy(os.Stderr, serr)
}
kubectlRunner := util.NewKubectlRunner(t)
podName := "busybox-mount"
podPath, _ := filepath.Abs("testdata/busybox-mount-test.yaml")
......@@ -127,8 +141,10 @@ func testMounting(t *testing.T) {
t.Fatalf("%v", err)
}
if strings.Contains(statOutput, "Access: 1970-01-01") {
t.Fatalf("Invalid access time\n%s", statOutput)
if runtime.GOOS == "windows" {
if strings.Contains(statOutput, "Access: 1970-01-01") {
t.Fatalf("Invalid access time\n%s", statOutput)
}
}
if strings.Contains(statOutput, "Modify: 1970-01-01") {
......
......@@ -99,6 +99,26 @@ func (m *MinikubeRunner) RunDaemon(command string) (*exec.Cmd, *bufio.Reader) {
}
func (m *MinikubeRunner) RunDaemon2(command string) (*exec.Cmd, *bufio.Reader, *bufio.Reader) {
commandArr := strings.Split(command, " ")
path, _ := filepath.Abs(m.BinaryPath)
cmd := exec.Command(path, commandArr...)
stdoutPipe, err := cmd.StdoutPipe()
if err != nil {
m.T.Fatalf("stdout pipe failed: %s %v", command, err)
}
stderrPipe, err := cmd.StderrPipe()
if err != nil {
m.T.Fatalf("stderr pipe failed: %s %v", command, err)
}
err = cmd.Start()
if err != nil {
m.T.Fatalf("Error running command: %s %v", command, err)
}
return cmd, bufio.NewReader(stdoutPipe), bufio.NewReader(stderrPipe)
}
func (m *MinikubeRunner) SSH(command string) (string, error) {
path, _ := filepath.Abs(m.BinaryPath)
cmd := exec.Command(path, "ssh", command)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册