github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify Create/Delete-TestingNamespace functions

Browse Source
This commit is contained in:
Wojciech Tyczyński
2022-05-15 15:33:19 +02:00
parent 9720d130e4
commit deef9e40de
35 changed files with 326 additions and 333 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
test/integration/deployment/deployment_test.go
View File

@@ -36,11 +36,11 @@ import (
)
func TestNewDeployment(t *testing.T) {
s, closeFn, rm, dc, informers, c := dcSetup(t)
closeFn, rm, dc, informers, c := dcSetup(t)
defer closeFn()
name := "test-new-deployment"
ns := framework.CreateTestingNamespace(name, s, t)
defer framework.DeleteTestingNamespace(ns, s, t)
ns := framework.CreateTestingNamespace(name, t)
defer framework.DeleteTestingNamespace(ns, t)
replicas := int32(20)
tester := &deploymentTester{t: t, c: c, deployment: newDeployment(name, ns.Name, replicas)}
@@ -111,11 +111,11 @@ func TestNewDeployment(t *testing.T) {
// TODO: drop the rollback portions of this test when extensions/v1beta1 is no longer served
// and rollback endpoint is no longer supported.
func TestDeploymentRollingUpdate(t *testing.T) {
s, closeFn, rm, dc, informers, c := dcSetup(t)
closeFn, rm, dc, informers, c := dcSetup(t)
defer closeFn()
name := "test-rolling-update-deployment"
ns := framework.CreateTestingNamespace(name, s, t)
defer framework.DeleteTestingNamespace(ns, s, t)
ns := framework.CreateTestingNamespace(name, t)
defer framework.DeleteTestingNamespace(ns, t)
// Start informer and controllers
stopControllers := runControllersAndInformers(t, rm, dc, informers)
@@ -205,11 +205,11 @@ func TestDeploymentRollingUpdate(t *testing.T) {
// selectors are IMMUTABLE for all API versions except apps/v1beta1 and extensions/v1beta1
func TestDeploymentSelectorImmutability(t *testing.T) {
s, closeFn, c := dcSimpleSetup(t)
closeFn, c := dcSimpleSetup(t)
defer closeFn()
name := "test-deployment-selector-immutability"
ns := framework.CreateTestingNamespace(name, s, t)
defer framework.DeleteTestingNamespace(ns, s, t)
ns := framework.CreateTestingNamespace(name, t)
defer framework.DeleteTestingNamespace(ns, t)
tester := &deploymentTester{t: t, c: c, deployment: newDeployment(name, ns.Name, int32(20))}
var err error
@@ -239,11 +239,11 @@ func TestDeploymentSelectorImmutability(t *testing.T) {
// Paused deployment should not start new rollout
func TestPausedDeployment(t *testing.T) {
s, closeFn, rm, dc, informers, c := dcSetup(t)
closeFn, rm, dc, informers, c := dcSetup(t)
defer closeFn()
name := "test-paused-deployment"
ns := framework.CreateTestingNamespace(name, s, t)
defer framework.DeleteTestingNamespace(ns, s, t)
ns := framework.CreateTestingNamespace(name, t)
defer framework.DeleteTestingNamespace(ns, t)
replicas := int32(1)
tester := &deploymentTester{t: t, c: c, deployment: newDeployment(name, ns.Name, replicas)}
@@ -338,11 +338,11 @@ func TestPausedDeployment(t *testing.T) {
// Paused deployment can be scaled
func TestScalePausedDeployment(t *testing.T) {
s, closeFn, rm, dc, informers, c := dcSetup(t)
closeFn, rm, dc, informers, c := dcSetup(t)
defer closeFn()
name := "test-scale-paused-deployment"
ns := framework.CreateTestingNamespace(name, s, t)
defer framework.DeleteTestingNamespace(ns, s, t)
ns := framework.CreateTestingNamespace(name, t)
defer framework.DeleteTestingNamespace(ns, t)
replicas := int32(1)
tester := &deploymentTester{t: t, c: c, deployment: newDeployment(name, ns.Name, replicas)}
@@ -418,11 +418,11 @@ func TestScalePausedDeployment(t *testing.T) {
// Deployment rollout shouldn't be blocked on hash collisions
func TestDeploymentHashCollision(t *testing.T) {
s, closeFn, rm, dc, informers, c := dcSetup(t)
closeFn, rm, dc, informers, c := dcSetup(t)
defer closeFn()
name := "test-hash-collision-deployment"
ns := framework.CreateTestingNamespace(name, s, t)
defer framework.DeleteTestingNamespace(ns, s, t)
ns := framework.CreateTestingNamespace(name, t)
defer framework.DeleteTestingNamespace(ns, t)
replicas := int32(1)
tester := &deploymentTester{t: t, c: c, deployment: newDeployment(name, ns.Name, replicas)}
@@ -516,11 +516,11 @@ func checkPodsHashLabel(pods *v1.PodList) (string, error) {
// Deployment should have a timeout condition when it fails to progress after given deadline.
func TestFailedDeployment(t *testing.T) {
s, closeFn, rm, dc, informers, c := dcSetup(t)
closeFn, rm, dc, informers, c := dcSetup(t)
defer closeFn()
name := "test-failed-deployment"
ns := framework.CreateTestingNamespace(name, s, t)
defer framework.DeleteTestingNamespace(ns, s, t)
ns := framework.CreateTestingNamespace(name, t)
defer framework.DeleteTestingNamespace(ns, t)
deploymentName := "progress-check"
replicas := int32(1)
@@ -559,11 +559,11 @@ func TestFailedDeployment(t *testing.T) {
}
func TestOverlappingDeployments(t *testing.T) {
s, closeFn, rm, dc, informers, c := dcSetup(t)
closeFn, rm, dc, informers, c := dcSetup(t)
defer closeFn()
name := "test-overlapping-deployments"
ns := framework.CreateTestingNamespace(name, s, t)
defer framework.DeleteTestingNamespace(ns, s, t)
ns := framework.CreateTestingNamespace(name, t)
defer framework.DeleteTestingNamespace(ns, t)
replicas := int32(1)
firstDeploymentName := "first-deployment"
@@ -639,11 +639,11 @@ func TestOverlappingDeployments(t *testing.T) {
// Deployment should not block rollout when updating spec replica number and template at the same time.
func TestScaledRolloutDeployment(t *testing.T) {
s, closeFn, rm, dc, informers, c := dcSetup(t)
closeFn, rm, dc, informers, c := dcSetup(t)
defer closeFn()
name := "test-scaled-rollout-deployment"
ns := framework.CreateTestingNamespace(name, s, t)
defer framework.DeleteTestingNamespace(ns, s, t)
ns := framework.CreateTestingNamespace(name, t)
defer framework.DeleteTestingNamespace(ns, t)
// Start informer and controllers
stopControllers := runControllersAndInformers(t, rm, dc, informers)
@@ -828,11 +828,11 @@ func TestScaledRolloutDeployment(t *testing.T) {
}
func TestSpecReplicasChange(t *testing.T) {
s, closeFn, rm, dc, informers, c := dcSetup(t)
closeFn, rm, dc, informers, c := dcSetup(t)
defer closeFn()
name := "test-spec-replicas-change"
ns := framework.CreateTestingNamespace(name, s, t)
defer framework.DeleteTestingNamespace(ns, s, t)
ns := framework.CreateTestingNamespace(name, t)
defer framework.DeleteTestingNamespace(ns, t)
deploymentName := "deployment"
replicas := int32(1)
@@ -881,11 +881,11 @@ func TestSpecReplicasChange(t *testing.T) {
}
func TestDeploymentAvailableCondition(t *testing.T) {
s, closeFn, rm, dc, informers, c := dcSetup(t)
closeFn, rm, dc, informers, c := dcSetup(t)
defer closeFn()
name := "test-deployment-available-condition"
ns := framework.CreateTestingNamespace(name, s, t)
defer framework.DeleteTestingNamespace(ns, s, t)
ns := framework.CreateTestingNamespace(name, t)
defer framework.DeleteTestingNamespace(ns, t)
deploymentName := "deployment"
replicas := int32(10)
@@ -999,11 +999,11 @@ func testRSControllerRefPatch(t *testing.T, tester *deploymentTester, rs *apps.R
}
func TestGeneralReplicaSetAdoption(t *testing.T) {
s, closeFn, rm, dc, informers, c := dcSetup(t)
closeFn, rm, dc, informers, c := dcSetup(t)
defer closeFn()
name := "test-general-replicaset-adoption"
ns := framework.CreateTestingNamespace(name, s, t)
defer framework.DeleteTestingNamespace(ns, s, t)
ns := framework.CreateTestingNamespace(name, t)
defer framework.DeleteTestingNamespace(ns, t)
deploymentName := "deployment"
replicas := int32(1)
@@ -1088,11 +1088,11 @@ func testScalingUsingScaleSubresource(t *testing.T, tester *deploymentTester, re
}
func TestDeploymentScaleSubresource(t *testing.T) {
s, closeFn, rm, dc, informers, c := dcSetup(t)
closeFn, rm, dc, informers, c := dcSetup(t)
defer closeFn()
name := "test-deployment-scale-subresource"
ns := framework.CreateTestingNamespace(name, s, t)
defer framework.DeleteTestingNamespace(ns, s, t)
ns := framework.CreateTestingNamespace(name, t)
defer framework.DeleteTestingNamespace(ns, t)
deploymentName := "deployment"
replicas := int32(2)
@@ -1129,11 +1129,11 @@ func TestDeploymentScaleSubresource(t *testing.T) {
// is orphaned, even without PodTemplateSpec change. Refer comment below for more info:
// https://github.com/kubernetes/kubernetes/pull/59212#discussion_r166465113
func TestReplicaSetOrphaningAndAdoptionWhenLabelsChange(t *testing.T) {
s, closeFn, rm, dc, informers, c := dcSetup(t)
closeFn, rm, dc, informers, c := dcSetup(t)
defer closeFn()
name := "test-replicaset-orphaning-and-adoption-when-labels-change"
ns := framework.CreateTestingNamespace(name, s, t)
defer framework.DeleteTestingNamespace(ns, s, t)
ns := framework.CreateTestingNamespace(name, t)
defer framework.DeleteTestingNamespace(ns, t)
deploymentName := "deployment"
replicas := int32(1)