github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 21:47:07 +00:00
Code Issues Projects Releases Wiki Activity

e2e: move funs of framework/deployment/fixtures.go to e2e/apps/deployment.go

Browse Source 
Signed-off-by: yuxiaobo <yuxiaobogo@163.com>
This commit is contained in:
yuxiaobo 2019-12-20 12:36:34 +08:00
parent b632eaddba
commit 4123973726
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
test/e2e/apps/deployment.go
View File

@ -460,7 +460,7 @@ func testRolloverDeployment(f *framework.Framework) {
err = e2edeploy.WaitForDeploymentUpdatedReplicasGTE(c, ns, deploymentName, deploymentReplicas, deployment.Generation) err = e2edeploy.WaitForDeploymentUpdatedReplicasGTE(c, ns, deploymentName, deploymentReplicas, deployment.Generation)
// Check if it's updated to revision 1 correctly // Check if it's updated to revision 1 correctly
framework.Logf("Check revision of new replica set for deployment %q", deploymentName) framework.Logf("Check revision of new replica set for deployment %q", deploymentName)
err = e2edeploy.CheckDeploymentRevisionAndImage(c, ns, deploymentName, "1", deploymentImage) err = checkDeploymentRevisionAndImage(c, ns, deploymentName, "1", deploymentImage)
framework.ExpectNoError(err) framework.ExpectNoError(err)
framework.Logf("Ensure that both replica sets have 1 created replica") framework.Logf("Ensure that both replica sets have 1 created replica")
@ -1122,3 +1122,8 @@ func waitForReplicaSetTargetSpecReplicas(c clientset.Interface, replicaSet *apps
} }
return err return err
} }
// checkDeploymentRevisionAndImage checks if the input deployment's and its new replica set's revision and image are as expected.
func checkDeploymentRevisionAndImage(c clientset.Interface, ns, deploymentName, revision, image string) error {
return testutil.CheckDeploymentRevisionAndImage(c, ns, deploymentName, revision, image)
}

5
test/e2e/framework/deployment/fixtures.go
View File

@ -35,11 +35,6 @@ func UpdateDeploymentWithRetries(c clientset.Interface, namespace, name string,
return testutils.UpdateDeploymentWithRetries(c, namespace, name, applyUpdate, framework.Logf, poll, pollShortTimeout) return testutils.UpdateDeploymentWithRetries(c, namespace, name, applyUpdate, framework.Logf, poll, pollShortTimeout)
} }
// CheckDeploymentRevisionAndImage checks if the input deployment's and its new replica set's revision and image are as expected.
func CheckDeploymentRevisionAndImage(c clientset.Interface, ns, deploymentName, revision, image string) error {
return testutils.CheckDeploymentRevisionAndImage(c, ns, deploymentName, revision, image)
}
// NewDeployment returns a deployment spec with the specified argument. // NewDeployment returns a deployment spec with the specified argument.
func NewDeployment(deploymentName string, replicas int32, podLabels map[string]string, imageName, image string, strategyType appsv1.DeploymentStrategyType) *appsv1.Deployment { func NewDeployment(deploymentName string, replicas int32, podLabels map[string]string, imageName, image string, strategyType appsv1.DeploymentStrategyType) *appsv1.Deployment {
zero := int64(0) zero := int64(0)