Merge pull request #1071 from dlorenc/isotesting

Add a test for required packages.

test/integration/iso_test.go

@@ -37,6 +37,7 @@ func TestISO(t *testing.T) {
 	minikubeRunner.Start()
 
 	t.Run("permissions", testMountPermissions)
+	t.Run("packages", testPackages)
 }
 
 func testMountPermissions(t *testing.T) {
@@ -50,8 +51,8 @@ func testMountPermissions(t *testing.T) {
 	foundMount := false
 
 	for _, dir := range mountPoints {
-		output := minikubeRunner.SSH(fmt.Sprintf("ls -l %s", dir))
-		if strings.Contains(output, "No such file or directory") {
+		output, err := minikubeRunner.SSH(fmt.Sprintf("ls -l %s", dir))
+		if err != nil {
 			continue
 		}
 		foundMount = true
@@ -63,3 +64,28 @@ func testMountPermissions(t *testing.T) {
 		t.Fatalf("No shared mount found. Checked %s", mountPoints)
 	}
 }
+
+func testPackages(t *testing.T) {
+	minikubeRunner := util.MinikubeRunner{
+		Args:       *args,
+		BinaryPath: *binaryPath,
+		T:          t}
+
+	packages := []string{
+		"git",
+		"rsync",
+		"curl",
+		"wget",
+		"socat",
+		"iptables",
+		"VBoxControl",
+		"VBoxService",
+	}
+
+	for _, pkg := range packages {
+		if output, err := minikubeRunner.SSH(fmt.Sprintf("which %s", pkg)); err != nil {
+			t.Errorf("Error finding package: %s. Error: %s. Output: %s", pkg, err, output)
+		}
+	}
+
+}

test/integration/util/util.go

@@ -69,12 +69,15 @@ func (m *MinikubeRunner) RunCommand(command string, checkError bool) string {
 	return string(stdout)
 }
 
-func (m *MinikubeRunner) SSH(command string) string {
+func (m *MinikubeRunner) SSH(command string) (string, error) {
 	path, _ := filepath.Abs(m.BinaryPath)
 	cmd := exec.Command(path, "ssh", command)
-	stdout, _ := cmd.CombinedOutput()
+	stdout, err := cmd.CombinedOutput()
+	if err, ok := err.(*exec.ExitError); ok {
+		return string(stdout), err
+	}
 
-	return string(stdout)
+	return string(stdout), nil
 }
 
 func (m *MinikubeRunner) Start() {