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

Merge pull request #10193 from priyawadhwa/refactor-start-stop 

Split up TestStartStop by container runtime
pull/10219/head^2
priyawadhwa 2021-01-25 12:38:59 -08:00 committed by GitHub
parent a3225d7dbf ff72cb81b6
commit 6e5a36f17a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
test/integration/main_test.go
View File

@ -115,6 +115,11 @@ func HyperVDriver() bool {
return strings.Contains(*startArgs, "--driver=hyperv") || strings.Contains(*startArgs, "--vm-driver=hyperv")
}
// VirtualboxDriver returns whether or not this test is using the VirtualBox driver
func VirtualboxDriver() bool {
return strings.Contains(*startArgs, "--driver=virtualbox") || strings.Contains(*startArgs, "--vm-driver=virtualbox")
}
// DockerDriver returns whether or not this test is using the docker or podman driver
func DockerDriver() bool {
return strings.Contains(*startArgs, "--driver=docker") || strings.Contains(*startArgs, "--vm-driver=docker")

15
test/integration/start_stop_delete_test.go
View File

@ -51,7 +51,6 @@ func TestStartStop(t *testing.T) {
"--kvm-qemu-uri=qemu:///system",
"--disable-driver-mounts",
"--keep-context=false",
"--container-runtime=docker",
}},
{"newest-cni", constants.NewestKubernetesVersion, []string{
"--feature-gates",
@ -60,14 +59,13 @@ func TestStartStop(t *testing.T) {
"--extra-config=kubelet.network-plugin=cni",
"--extra-config=kubeadm.pod-network-cidr=192.168.111.111/16",
}},
{"containerd", constants.DefaultKubernetesVersion, []string{
"--container-runtime=containerd",
"--docker-opt",
"containerd=/var/run/containerd/containerd.sock",
{"default-k8s-different-port", constants.DefaultKubernetesVersion, []string{
"--apiserver-port=8444",
}},
{"crio", "v1.15.7", []string{
"--container-runtime=crio",
{"no-preload", constants.NewestKubernetesVersion, []string{
"--preload=false",
}},
{"disable-driver-mounts", constants.DefaultKubernetesVersion, []string{
"--disable-driver-mounts",
"--extra-config=kubeadm.ignore-preflight-errors=SystemVerification",
}},
@ -87,6 +85,9 @@ func TestStartStop(t *testing.T) {
if !strings.Contains(tc.name, "docker") && NoneDriver() {
t.Skipf("skipping %s - incompatible with none driver", t.Name())
}
if strings.Contains(tc.name, "disable_driver_mounts") && !VirtualboxDriver() {
t.Skipf("skipping %s - only runs on virtualbox", t.Name())
}
waitFlag := "--wait=true"
if strings.Contains(tc.name, "cni") { // wait=app_running is broken for CNI https://github.com/kubernetes/minikube/issues/7354