From ab208e9063a0ff3895ed2ef61492dcbcbe69e887 Mon Sep 17 00:00:00 2001
From: Kenichi Omichi <ken-oomichi@wx.jp.nec.com>
Date: Sat, 12 Oct 2019 00:00:27 +0000
Subject: [PATCH] Remove test_verify from e2e framework package

test_verify.go contained the function TestPodSuccessOrFail() only,
and the function is used in the package only.
This moves the function to create.go and remove test_verify.go.
---
 test/e2e/framework/pod/BUILD          |  1 -
 test/e2e/framework/pod/create.go      | 12 ++++++++-
 test/e2e/framework/pod/test_verify.go | 37 ---------------------------
 3 files changed, 11 insertions(+), 39 deletions(-)
 delete mode 100644 test/e2e/framework/pod/test_verify.go

diff --git a/test/e2e/framework/pod/BUILD b/test/e2e/framework/pod/BUILD
index 7995c90907a..27dfc95d377 100644
--- a/test/e2e/framework/pod/BUILD
+++ b/test/e2e/framework/pod/BUILD
@@ -7,7 +7,6 @@ go_library(
         "delete.go",
         "node_selection.go",
         "resource.go",
-        "test_verify.go",
         "wait.go",
     ],
     importpath = "k8s.io/kubernetes/test/e2e/framework/pod",
diff --git a/test/e2e/framework/pod/create.go b/test/e2e/framework/pod/create.go
index 6f9aea30edb..e3ecb61c0d1 100644
--- a/test/e2e/framework/pod/create.go
+++ b/test/e2e/framework/pod/create.go
@@ -50,13 +50,23 @@ func CreateWaitAndDeletePod(c clientset.Interface, ns string, pvc *v1.Persistent
 		}
 	}()
 
-	err = TestPodSuccessOrFail(c, ns, runPod)
+	err = testPodSuccessOrFail(c, ns, runPod)
 	if err != nil {
 		return fmt.Errorf("pod %q did not exit with Success: %v", runPod.Name, err)
 	}
 	return // note: named return value
 }
 
+// testPodSuccessOrFail tests whether the pod's exit code is zero.
+func testPodSuccessOrFail(c clientset.Interface, ns string, pod *v1.Pod) error {
+	e2elog.Logf("Pod should terminate with exitcode 0 (success)")
+	if err := WaitForPodSuccessInNamespace(c, pod.Name, ns); err != nil {
+		return fmt.Errorf("pod %q failed to reach Success: %v", pod.Name, err)
+	}
+	e2elog.Logf("Pod %v succeeded ", pod.Name)
+	return nil
+}
+
 // CreateUnschedulablePod with given claims based on node selector
 func CreateUnschedulablePod(client clientset.Interface, namespace string, nodeSelector map[string]string, pvclaims []*v1.PersistentVolumeClaim, isPrivileged bool, command string) (*v1.Pod, error) {
 	pod := MakePod(namespace, nodeSelector, pvclaims, isPrivileged, command)
diff --git a/test/e2e/framework/pod/test_verify.go b/test/e2e/framework/pod/test_verify.go
deleted file mode 100644
index 426e138b7a6..00000000000
--- a/test/e2e/framework/pod/test_verify.go
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-Copyright 2019 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package pod
-
-import (
-	"fmt"
-
-	"github.com/onsi/ginkgo"
-
-	v1 "k8s.io/api/core/v1"
-	clientset "k8s.io/client-go/kubernetes"
-	e2elog "k8s.io/kubernetes/test/e2e/framework/log"
-)
-
-// TestPodSuccessOrFail tests whether the pod's exit code is zero.
-func TestPodSuccessOrFail(c clientset.Interface, ns string, pod *v1.Pod) error {
-	ginkgo.By("Pod should terminate with exitcode 0 (success)")
-	if err := WaitForPodSuccessInNamespace(c, pod.Name, ns); err != nil {
-		return fmt.Errorf("pod %q failed to reach Success: %v", pod.Name, err)
-	}
-	e2elog.Logf("Pod %v succeeded ", pod.Name)
-	return nil
-}