Skip to content

Commit 37984e8

Browse files
authored
Clean up tests (#2330)
1 parent f58204b commit 37984e8

5 files changed

+23
-31
lines changed

kubernetes/resource_kubernetes_deployment_v1_test.go

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,7 @@ func TestAccKubernetesDeploymentV1_with_container_liveness_probe_using_exec(t *t
398398
resource.TestCheckResourceAttr(resourceName, "spec.0.template.0.spec.0.container.0.liveness_probe.0.exec.0.command.0", "cat"),
399399
resource.TestCheckResourceAttr(resourceName, "spec.0.template.0.spec.0.container.0.liveness_probe.0.exec.0.command.1", "/tmp/healthy"),
400400
resource.TestCheckResourceAttr(resourceName, "spec.0.template.0.spec.0.container.0.liveness_probe.0.failure_threshold", "3"),
401-
resource.TestCheckResourceAttr(resourceName, "spec.0.template.0.spec.0.container.0.liveness_probe.0.initial_delay_seconds", "5"),
401+
resource.TestCheckResourceAttr(resourceName, "spec.0.template.0.spec.0.container.0.liveness_probe.0.initial_delay_seconds", "3"),
402402
),
403403
},
404404
},
@@ -1359,7 +1359,8 @@ func testAccKubernetesDeploymentV1Config_basic(name, imageName string) string {
13591359
}
13601360
13611361
readiness_probe {
1362-
initial_delay_seconds = 5
1362+
initial_delay_seconds = 3
1363+
period_seconds = 1
13631364
http_get {
13641365
path = "/"
13651366
port = 80
@@ -1857,9 +1858,8 @@ func testAccKubernetesDeploymentV1ConfigWithLivenessProbeUsingExec(deploymentNam
18571858
exec {
18581859
command = ["cat", "/tmp/healthy"]
18591860
}
1860-
1861-
initial_delay_seconds = 5
1862-
period_seconds = 5
1861+
initial_delay_seconds = 3
1862+
period_seconds = 1
18631863
}
18641864
}
18651865
termination_grace_period_seconds = 1
@@ -1910,9 +1910,8 @@ func testAccKubernetesDeploymentV1ConfigWithLivenessProbeUsingHTTPGet(deployment
19101910
value = "Awesome"
19111911
}
19121912
}
1913-
19141913
initial_delay_seconds = 3
1915-
period_seconds = 3
1914+
period_seconds = 1
19161915
}
19171916
}
19181917
termination_grace_period_seconds = 1
@@ -1957,9 +1956,8 @@ func testAccKubernetesDeploymentV1ConfigWithLivenessProbeUsingTCP(deploymentName
19571956
tcp_socket {
19581957
port = 8080
19591958
}
1960-
19611959
initial_delay_seconds = 3
1962-
period_seconds = 3
1960+
period_seconds = 1
19631961
}
19641962
}
19651963
termination_grace_period_seconds = 1

kubernetes/resource_kubernetes_persistent_volume_v1_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -446,7 +446,6 @@ func TestAccKubernetesPersistentVolumeV1_hostPath_volumeSource(t *testing.T) {
446446
IDRefreshName: resourceName,
447447
IDRefreshIgnore: []string{"metadata.0.resource_version"},
448448
ProviderFactories: testAccProviderFactories,
449-
ExternalProviders: testAccExternalProviders,
450449
CheckDestroy: testAccCheckKubernetesPersistentVolumeV1Destroy,
451450
Steps: []resource.TestStep{
452451
{

kubernetes/resource_kubernetes_pod_v1_test.go

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -522,7 +522,7 @@ func TestAccKubernetesPodV1_with_container_liveness_probe_using_exec(t *testing.
522522
resource.TestCheckResourceAttr(resourceName, "spec.0.container.0.liveness_probe.0.exec.0.command.0", "cat"),
523523
resource.TestCheckResourceAttr(resourceName, "spec.0.container.0.liveness_probe.0.exec.0.command.1", "/tmp/healthy"),
524524
resource.TestCheckResourceAttr(resourceName, "spec.0.container.0.liveness_probe.0.failure_threshold", "3"),
525-
resource.TestCheckResourceAttr(resourceName, "spec.0.container.0.liveness_probe.0.initial_delay_seconds", "5"),
525+
resource.TestCheckResourceAttr(resourceName, "spec.0.container.0.liveness_probe.0.initial_delay_seconds", "3"),
526526
),
527527
},
528528
{
@@ -2036,9 +2036,8 @@ func testAccKubernetesPodV1ConfigWithLivenessProbeUsingExec(podName, imageName s
20362036
exec {
20372037
command = ["cat", "/tmp/healthy"]
20382038
}
2039-
2040-
initial_delay_seconds = 5
2041-
period_seconds = 5
2039+
initial_delay_seconds = 3
2040+
period_seconds = 1
20422041
}
20432042
}
20442043
termination_grace_period_seconds = 1
@@ -2073,9 +2072,8 @@ func testAccKubernetesPodV1ConfigWithLivenessProbeUsingHTTPGet(podName, imageNam
20732072
value = "Awesome"
20742073
}
20752074
}
2076-
20772075
initial_delay_seconds = 3
2078-
period_seconds = 3
2076+
period_seconds = 1
20792077
}
20802078
}
20812079
}
@@ -2103,9 +2101,8 @@ func testAccKubernetesPodV1ConfigWithLivenessProbeUsingTCP(podName, imageName st
21032101
tcp_socket {
21042102
port = 8080
21052103
}
2106-
21072104
initial_delay_seconds = 3
2108-
period_seconds = 3
2105+
period_seconds = 1
21092106
}
21102107
}
21112108
}
@@ -2134,9 +2131,8 @@ func testAccKubernetesPodV1ConfigWithLivenessProbeUsingGRPC(podName, imageName s
21342131
port = 8888
21352132
service = "EchoService"
21362133
}
2137-
2138-
initial_delay_seconds = 30
2139-
period_seconds = 30
2134+
initial_delay_seconds = 3
2135+
period_seconds = 1
21402136
}
21412137
}
21422138
}

kubernetes/resource_kubernetes_replication_controller_v1_test.go

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ func TestAccKubernetesReplicationControllerV1_with_container_liveness_probe_usin
278278
resource.TestCheckResourceAttr(resourceName, "spec.0.template.0.spec.0.container.0.liveness_probe.0.exec.0.command.0", "cat"),
279279
resource.TestCheckResourceAttr(resourceName, "spec.0.template.0.spec.0.container.0.liveness_probe.0.exec.0.command.1", "/tmp/healthy"),
280280
resource.TestCheckResourceAttr(resourceName, "spec.0.template.0.spec.0.container.0.liveness_probe.0.failure_threshold", "3"),
281-
resource.TestCheckResourceAttr(resourceName, "spec.0.template.0.spec.0.container.0.liveness_probe.0.initial_delay_seconds", "5"),
281+
resource.TestCheckResourceAttr(resourceName, "spec.0.template.0.spec.0.container.0.liveness_probe.0.initial_delay_seconds", "3"),
282282
),
283283
},
284284
},
@@ -895,9 +895,8 @@ func testAccKubernetesReplicationControllerV1ConfigWithLivenessProbeUsingExec(rc
895895
exec {
896896
command = ["cat", "/tmp/healthy"]
897897
}
898-
899-
initial_delay_seconds = 5
900-
period_seconds = 5
898+
initial_delay_seconds = 3
899+
period_seconds = 1
901900
}
902901
}
903902
}
@@ -945,9 +944,8 @@ func testAccKubernetesReplicationControllerV1ConfigWithLivenessProbeUsingHTTPGet
945944
value = "Awesome"
946945
}
947946
}
948-
949947
initial_delay_seconds = 3
950-
period_seconds = 3
948+
period_seconds = 1
951949
}
952950
}
953951
}
@@ -989,9 +987,8 @@ func testAccKubernetesReplicationControllerV1ConfigWithLivenessProbeUsingTCP(rcN
989987
tcp_socket {
990988
port = 8080
991989
}
992-
993990
initial_delay_seconds = 3
994-
period_seconds = 3
991+
period_seconds = 1
995992
}
996993
}
997994
}

kubernetes/resource_kubernetes_stateful_set_v1_test.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -501,7 +501,8 @@ func testAccKubernetesStatefulSetV1ConfigBasic(name, imageName string) string {
501501
}
502502
503503
readiness_probe {
504-
initial_delay_seconds = 5
504+
initial_delay_seconds = 3
505+
period_seconds = 1
505506
http_get {
506507
path = "/"
507508
port = 80
@@ -1116,7 +1117,8 @@ func testAccKubernetesStatefulSetV1ConfigWaitForRollout(name, imageName, waitFor
11161117
}
11171118
11181119
readiness_probe {
1119-
initial_delay_seconds = 5
1120+
initial_delay_seconds = 3
1121+
period_seconds = 1
11201122
tcp_socket {
11211123
port = 80
11221124
}

0 commit comments

Comments
 (0)