From 4123973726cdc4edad68dc3d27d48bc232193f14 Mon Sep 17 00:00:00 2001 From: yuxiaobo Date: Fri, 20 Dec 2019 12:36:34 +0800 Subject: [PATCH] e2e: move funs of framework/deployment/fixtures.go to e2e/apps/deployment.go Signed-off-by: yuxiaobo --- test/e2e/apps/deployment.go | 7 ++++++- test/e2e/framework/deployment/fixtures.go | 5 ----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/test/e2e/apps/deployment.go b/test/e2e/apps/deployment.go index fee8814320c..f824524685f 100644 --- a/test/e2e/apps/deployment.go +++ b/test/e2e/apps/deployment.go @@ -460,7 +460,7 @@ func testRolloverDeployment(f *framework.Framework) { err = e2edeploy.WaitForDeploymentUpdatedReplicasGTE(c, ns, deploymentName, deploymentReplicas, deployment.Generation) // Check if it's updated to revision 1 correctly 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.Logf("Ensure that both replica sets have 1 created replica") @@ -1122,3 +1122,8 @@ func waitForReplicaSetTargetSpecReplicas(c clientset.Interface, replicaSet *apps } 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) +} diff --git a/test/e2e/framework/deployment/fixtures.go b/test/e2e/framework/deployment/fixtures.go index 40153e5893e..6d72b8a512c 100644 --- a/test/e2e/framework/deployment/fixtures.go +++ b/test/e2e/framework/deployment/fixtures.go @@ -35,11 +35,6 @@ func UpdateDeploymentWithRetries(c clientset.Interface, namespace, name string, 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. func NewDeployment(deploymentName string, replicas int32, podLabels map[string]string, imageName, image string, strategyType appsv1.DeploymentStrategyType) *appsv1.Deployment { zero := int64(0)