diff --git a/test/integration/replicaset/replicaset_test.go b/test/integration/replicaset/replicaset_test.go index ac4642f763..d19180ea62 100644 --- a/test/integration/replicaset/replicaset_test.go +++ b/test/integration/replicaset/replicaset_test.go @@ -112,32 +112,6 @@ func newMatchingPod(podName, namespace string) *v1.Pod { } } -// verifyRemainingObjects verifies if the number of the remaining replica -// sets and pods are rsNum and podNum. It returns error if the -// communication with the API server fails. -func verifyRemainingObjects(t *testing.T, clientSet clientset.Interface, namespace string, rsNum, podNum int) (bool, error) { - rsClient := clientSet.ExtensionsV1beta1().ReplicaSets(namespace) - podClient := clientSet.CoreV1().Pods(namespace) - pods, err := podClient.List(metav1.ListOptions{}) - if err != nil { - return false, fmt.Errorf("Failed to list pods: %v", err) - } - var ret = true - if len(pods.Items) != podNum { - ret = false - t.Logf("expect %d pods, got %d pods", podNum, len(pods.Items)) - } - rss, err := rsClient.List(metav1.ListOptions{}) - if err != nil { - return false, fmt.Errorf("Failed to list replica sets: %v", err) - } - if len(rss.Items) != rsNum { - ret = false - t.Logf("expect %d RSs, got %d RSs", rsNum, len(rss.Items)) - } - return ret, nil -} - func rmSetup(t *testing.T) (*httptest.Server, framework.CloseFunc, *replicaset.ReplicaSetController, informers.SharedInformerFactory, clientset.Interface) { masterConfig := framework.NewIntegrationTestMasterConfig() _, s, closeFn := framework.RunAMaster(masterConfig) diff --git a/test/integration/replicationcontroller/replicationcontroller_test.go b/test/integration/replicationcontroller/replicationcontroller_test.go index 5564b22f52..7f30945dfc 100644 --- a/test/integration/replicationcontroller/replicationcontroller_test.go +++ b/test/integration/replicationcontroller/replicationcontroller_test.go @@ -105,32 +105,6 @@ func newMatchingPod(podName, namespace string) *v1.Pod { } } -// verifyRemainingObjects verifies if the number of the remaining replication -// controllers and pods are rcNum and podNum. It returns error if the -// communication with the API server fails. -func verifyRemainingObjects(t *testing.T, clientSet clientset.Interface, namespace string, rcNum, podNum int) (bool, error) { - rcClient := clientSet.CoreV1().ReplicationControllers(namespace) - podClient := clientSet.CoreV1().Pods(namespace) - pods, err := podClient.List(metav1.ListOptions{}) - if err != nil { - return false, fmt.Errorf("Failed to list pods: %v", err) - } - var ret = true - if len(pods.Items) != podNum { - ret = false - t.Logf("expect %d pods, got %d pods", podNum, len(pods.Items)) - } - rcs, err := rcClient.List(metav1.ListOptions{}) - if err != nil { - return false, fmt.Errorf("Failed to list replication controllers: %v", err) - } - if len(rcs.Items) != rcNum { - ret = false - t.Logf("expect %d RCs, got %d RCs", rcNum, len(rcs.Items)) - } - return ret, nil -} - func rmSetup(t *testing.T) (*httptest.Server, framework.CloseFunc, *replication.ReplicationManager, informers.SharedInformerFactory, clientset.Interface) { masterConfig := framework.NewIntegrationTestMasterConfig() _, s, closeFn := framework.RunAMaster(masterConfig)