kubernetes
/
minikube
mirror of https://github.com/kubernetes/minikube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Move --install-addons toggle to tests that do not use addons

pull/6536/head
Thomas Stromberg 2020-02-06 17:35:52 -08:00
parent 4ba0f52f57
commit caf4c62943
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/integration/docker_test.go
View File

@ -37,7 +37,7 @@ func TestDockerFlags(t *testing.T) {
defer CleanupWithLogs(t, profile, cancel) defer CleanupWithLogs(t, profile, cancel)
// Use the most verbose logging for the simplest test. If it fails, something is very wrong. // Use the most verbose logging for the simplest test. If it fails, something is very wrong.
args := append([]string{"start", "-p", profile, "--cache-images=false", "--wait=false", "--docker-env=FOO=BAR", "--docker-env=BAZ=BAT", "--docker-opt=debug", "--docker-opt=icc=true", "--alsologtostderr", "-v=5"}, StartArgs()...) args := append([]string{"start", "-p", profile, "--cache-images=false", "--install-addons=false", "--wait=false", "--docker-env=FOO=BAR", "--docker-env=BAZ=BAT", "--docker-opt=debug", "--docker-opt=icc=true", "--alsologtostderr", "-v=5"}, StartArgs()...)
rr, err := Run(t, exec.CommandContext(ctx, Target(), args...)) rr, err := Run(t, exec.CommandContext(ctx, Target(), args...))
if err != nil { if err != nil {
t.Errorf("%s failed: %v", rr.Args, err) t.Errorf("%s failed: %v", rr.Args, err)

2
test/integration/guest_env_test.go
View File

@ -33,7 +33,7 @@ func TestGuestEnvironment(t *testing.T) {
ctx, cancel := context.WithTimeout(context.Background(), 15*time.Minute) ctx, cancel := context.WithTimeout(context.Background(), 15*time.Minute)
defer CleanupWithLogs(t, profile, cancel) defer CleanupWithLogs(t, profile, cancel)
args := append([]string{"start", "-p", profile, "--wait=false"}, StartArgs()...) args := append([]string{"start", "-p", profile, "--install-addons=false", "--wait=false"}, StartArgs()...)
rr, err := Run(t, exec.CommandContext(ctx, Target(), args...)) rr, err := Run(t, exec.CommandContext(ctx, Target(), args...))
if err != nil { if err != nil {
t.Errorf("%s failed: %v", rr.Args, err) t.Errorf("%s failed: %v", rr.Args, err)

1
test/integration/start_stop_delete_test.go
View File

@ -53,7 +53,6 @@ func TestStartStop(t *testing.T) {
"--disable-driver-mounts", "--disable-driver-mounts",
"--keep-context=false", "--keep-context=false",
"--container-runtime=docker", "--container-runtime=docker",
"--install-addons=false",
}}, }},
{"newest-cni", constants.NewestKubernetesVersion, []string{ {"newest-cni", constants.NewestKubernetesVersion, []string{
"--feature-gates", "--feature-gates",