Make GlobalArgs vs StartArgs more explicit

test/integration/docker_test.go

@@ -28,7 +28,7 @@ import (
 
 func TestDocker(t *testing.T) {
 	mk := NewMinikubeRunner(t, "--wait=false")
-	if strings.Contains(mk.StartArgs, "--vm-driver=none") {
+	if usingNoneDriver(mk) {
 		t.Skip("skipping test as none driver does not bundle docker")
 	}
 
@@ -40,7 +40,7 @@ func TestDocker(t *testing.T) {
 		t.Logf("pre-delete failed (probably ok): %v", err)
 	}
 
-	startCmd := fmt.Sprintf("start %s %s %s", mk.StartArgs, mk.Args,
+	startCmd := fmt.Sprintf("start %s %s %s", mk.StartArgs, mk.GlobalArgs,
 		"--docker-env=FOO=BAR --docker-env=BAZ=BAT --docker-opt=debug --docker-opt=icc=true")
 	stdout, stderr, err := mk.RunWithContext(ctx, startCmd)
 	if err != nil {

test/integration/flags.go

@@ -32,7 +32,7 @@ func TestMain(m *testing.M) {
 }
 
 var binaryPath = flag.String("binary", "../../out/minikube", "path to minikube binary")
-var args = flag.String("minikube-args", "", "Arguments to pass to minikube")
+var globalArgs = flag.String("minikube-args", "", "Arguments to pass to minikube")
 var startArgs = flag.String("minikube-start-args", "", "Arguments to pass to minikube start")
 var mountArgs = flag.String("minikube-mount-args", "", "Arguments to pass to minikube mount")
 var testdataDir = flag.String("testdata-dir", "testdata", "the directory relative to test/integration where the testdata lives")
@@ -40,9 +40,9 @@ var testdataDir = flag.String("testdata-dir", "testdata", "the directory relativ
 // NewMinikubeRunner creates a new MinikubeRunner
 func NewMinikubeRunner(t *testing.T, extraArgs ...string) util.MinikubeRunner {
 	return util.MinikubeRunner{
-		Args:       *args + strings.Join(extraArgs, " "),
 		BinaryPath: *binaryPath,
-		StartArgs:  *startArgs,
+		StartArgs:  *startArgs + strings.Join(extraArgs, " "),
+		GlobalArgs: *globalArgs,
 		MountArgs:  *mountArgs,
 		T:          t,
 	}

test/integration/mount_test.go

@@ -38,7 +38,7 @@ func testMounting(t *testing.T) {
 	if runtime.GOOS == "darwin" {
 		t.Skip("mount tests disabled in darwin due to timeout (issue#3200)")
 	}
-	if strings.Contains(*args, "--vm-driver=none") {
+	if strings.Contains(*globalArgs, "--vm-driver=none") {
 		t.Skip("skipping test for none driver as it does not need mount")
 	}
 

test/integration/persistence_test.go

@@ -21,7 +21,6 @@ package integration
 import (
 	"path"
 	"path/filepath"
-	"strings"
 	"testing"
 	"time"
 
@@ -31,7 +30,7 @@ import (
 
 func TestPersistence(t *testing.T) {
 	mk := NewMinikubeRunner(t, "--wait=false")
-	if strings.Contains(mk.StartArgs, "--vm-driver=none") {
+	if usingNoneDriver(mk) {
 		t.Skip("skipping test as none driver does not support persistence")
 	}
 	mk.EnsureRunning()

test/integration/proxy_test.go

@@ -112,7 +112,7 @@ func testProxyWarning(t *testing.T) {
 	r := NewMinikubeRunner(t, "--wait=false")
 	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Minute)
 	defer cancel()
-	startCmd := fmt.Sprintf("start %s %s %s", r.StartArgs, r.Args, "--alsologtostderr --v=5")
+	startCmd := fmt.Sprintf("start %s %s", r.StartArgs, r.GlobalArgs)
 	stdout, stderr, err := r.RunWithContext(ctx, startCmd)
 	if err != nil {
 		t.Fatalf("start: %v\nstdout: %s\nstderr: %s", err, stdout, stderr)

test/integration/util/util.go

@@ -43,7 +43,7 @@ const kubectlBinary = "kubectl"
 type MinikubeRunner struct {
 	T          *testing.T
 	BinaryPath string
-	Args       string
+	GlobalArgs string
 	StartArgs  string
 	MountArgs  string
 	Runtime    string
@@ -210,7 +210,7 @@ func (m *MinikubeRunner) SSH(command string) (string, error) {
 
 // Start starts the cluster
 func (m *MinikubeRunner) Start(opts ...string) {
-	cmd := fmt.Sprintf("start %s %s %s --alsologtostderr --v=2", m.StartArgs, m.Args, strings.Join(opts, " "))
+	cmd := fmt.Sprintf("start %s %s %s --alsologtostderr --v=2", m.StartArgs, m.GlobalArgs, strings.Join(opts, " "))
 	m.RunCommand(cmd, true)
 }
 
@@ -234,12 +234,12 @@ func (m *MinikubeRunner) ParseEnvCmdOutput(out string) map[string]string {
 
 // GetStatus returns the status of a service
 func (m *MinikubeRunner) GetStatus() string {
-	return m.RunCommand(fmt.Sprintf("status --format={{.Host}} %s", m.Args), false)
+	return m.RunCommand(fmt.Sprintf("status --format={{.Host}} %s", m.GlobalArgs), false)
 }
 
 // GetLogs returns the logs of a service
 func (m *MinikubeRunner) GetLogs() string {
-	return m.RunCommand(fmt.Sprintf("logs %s", m.Args), true)
+	return m.RunCommand(fmt.Sprintf("logs %s", m.GlobalArgs), true)
 }
 
 // CheckStatus makes sure the service has the desired status, or cause fatal error