From 2d24d981c0eee3faafd41e47de2323e69aac5112 Mon Sep 17 00:00:00 2001 From: Jan Safranek Date: Mon, 27 Jun 2016 10:16:02 +0200 Subject: [PATCH] Remove duplicate deleteAllEtcdKeys(). --- test/integration/client_test.go | 2 +- test/integration/persistent_volumes_test.go | 26 ++++++++++----------- test/integration/service_account_test.go | 2 +- test/integration/utils.go | 14 ----------- 4 files changed, 15 insertions(+), 29 deletions(-) diff --git a/test/integration/client_test.go b/test/integration/client_test.go index 314aa1fb188..338d9dc9419 100644 --- a/test/integration/client_test.go +++ b/test/integration/client_test.go @@ -442,7 +442,7 @@ func TestSingleWatch(t *testing.T) { defer s.Close() ns := "blargh" - deleteAllEtcdKeys() + framework.DeleteAllEtcdKeys() client := client.NewOrDie(&restclient.Config{Host: s.URL, ContentConfig: restclient.ContentConfig{GroupVersion: testapi.Default.GroupVersion()}}) mkEvent := func(i int) *api.Event { diff --git a/test/integration/persistent_volumes_test.go b/test/integration/persistent_volumes_test.go index e6e0ccee080..c1631a2e347 100644 --- a/test/integration/persistent_volumes_test.go +++ b/test/integration/persistent_volumes_test.go @@ -108,7 +108,7 @@ func TestPersistentVolumeRecycler(t *testing.T) { _, s := framework.RunAMaster(t) defer s.Close() - deleteAllEtcdKeys() + framework.DeleteAllEtcdKeys() testClient, ctrl, watchPV, watchPVC := createClients(t, s) defer watchPV.Stop() defer watchPVC.Stop() @@ -156,7 +156,7 @@ func TestPersistentVolumeDeleter(t *testing.T) { _, s := framework.RunAMaster(t) defer s.Close() - deleteAllEtcdKeys() + framework.DeleteAllEtcdKeys() testClient, ctrl, watchPV, watchPVC := createClients(t, s) defer watchPV.Stop() defer watchPVC.Stop() @@ -208,7 +208,7 @@ func TestPersistentVolumeBindRace(t *testing.T) { _, s := framework.RunAMaster(t) defer s.Close() - deleteAllEtcdKeys() + framework.DeleteAllEtcdKeys() testClient, ctrl, watchPV, watchPVC := createClients(t, s) defer watchPV.Stop() defer watchPVC.Stop() @@ -273,7 +273,7 @@ func TestPersistentVolumeClaimLabelSelector(t *testing.T) { _, s := framework.RunAMaster(t) defer s.Close() - deleteAllEtcdKeys() + framework.DeleteAllEtcdKeys() testClient, controller, watchPV, watchPVC := createClients(t, s) defer watchPV.Stop() defer watchPVC.Stop() @@ -346,7 +346,7 @@ func TestPersistentVolumeClaimLabelSelectorMatchExpressions(t *testing.T) { _, s := framework.RunAMaster(t) defer s.Close() - deleteAllEtcdKeys() + framework.DeleteAllEtcdKeys() testClient, controller, watchPV, watchPVC := createClients(t, s) defer watchPV.Stop() defer watchPVC.Stop() @@ -438,7 +438,7 @@ func TestPersistentVolumeMultiPVs(t *testing.T) { _, s := framework.RunAMaster(t) defer s.Close() - deleteAllEtcdKeys() + framework.DeleteAllEtcdKeys() testClient, controller, watchPV, watchPVC := createClients(t, s) defer watchPV.Stop() defer watchPVC.Stop() @@ -513,7 +513,7 @@ func TestPersistentVolumeMultiPVs(t *testing.T) { waitForAnyPersistentVolumePhase(watchPV, api.VolumeReleased) t.Log("volumes released") - deleteAllEtcdKeys() + framework.DeleteAllEtcdKeys() } // TestPersistentVolumeMultiPVsPVCs tests binding of 100 PVC to 100 PVs. @@ -522,7 +522,7 @@ func TestPersistentVolumeMultiPVsPVCs(t *testing.T) { _, s := framework.RunAMaster(t) defer s.Close() - deleteAllEtcdKeys() + framework.DeleteAllEtcdKeys() testClient, binder, watchPV, watchPVC := createClients(t, s) defer watchPV.Stop() defer watchPVC.Stop() @@ -593,7 +593,7 @@ func TestPersistentVolumeMultiPVsPVCs(t *testing.T) { glog.V(2).Infof("PVC %q is bound to PV %q", pvc.Name, pvc.Spec.VolumeName) } testSleep() - deleteAllEtcdKeys() + framework.DeleteAllEtcdKeys() } // TestPersistentVolumeProvisionMultiPVCs tests provisioning of many PVCs. @@ -602,7 +602,7 @@ func TestPersistentVolumeProvisionMultiPVCs(t *testing.T) { _, s := framework.RunAMaster(t) defer s.Close() - deleteAllEtcdKeys() + framework.DeleteAllEtcdKeys() testClient, binder, watchPV, watchPVC := createClients(t, s) defer watchPV.Stop() defer watchPVC.Stop() @@ -672,7 +672,7 @@ func TestPersistentVolumeProvisionMultiPVCs(t *testing.T) { } glog.V(2).Infof("TestPersistentVolumeProvisionMultiPVCs: volumes are deleted") - deleteAllEtcdKeys() + framework.DeleteAllEtcdKeys() } // TestPersistentVolumeMultiPVsDiffAccessModes tests binding of one PVC to two @@ -681,7 +681,7 @@ func TestPersistentVolumeMultiPVsDiffAccessModes(t *testing.T) { _, s := framework.RunAMaster(t) defer s.Close() - deleteAllEtcdKeys() + framework.DeleteAllEtcdKeys() testClient, controller, watchPV, watchPVC := createClients(t, s) defer watchPV.Stop() defer watchPVC.Stop() @@ -747,7 +747,7 @@ func TestPersistentVolumeMultiPVsDiffAccessModes(t *testing.T) { waitForAnyPersistentVolumePhase(watchPV, api.VolumeReleased) t.Log("volume released") - deleteAllEtcdKeys() + framework.DeleteAllEtcdKeys() } func waitForPersistentVolumePhase(client *clientset.Clientset, pvName string, w watch.Interface, phase api.PersistentVolumePhase) { diff --git a/test/integration/service_account_test.go b/test/integration/service_account_test.go index 63d2712590d..0bbd507c4b5 100644 --- a/test/integration/service_account_test.go +++ b/test/integration/service_account_test.go @@ -337,7 +337,7 @@ func TestServiceAccountTokenAuthentication(t *testing.T) { // It is the responsibility of the caller to ensure the returned stopFunc is called func startServiceAccountTestServer(t *testing.T) (*clientset.Clientset, restclient.Config, func()) { - deleteAllEtcdKeys() + framework.DeleteAllEtcdKeys() // Listener var m *master.Master diff --git a/test/integration/utils.go b/test/integration/utils.go index 290cc8a94c0..16070ba8161 100644 --- a/test/integration/utils.go +++ b/test/integration/utils.go @@ -51,20 +51,6 @@ func withEtcdKey(f func(string)) { f(prefix) } -func deleteAllEtcdKeys() { - keysAPI := etcd.NewKeysAPI(newEtcdClient()) - keys, err := keysAPI.Get(context.TODO(), "/", nil) - if err != nil { - glog.Fatalf("Unable to list root etcd keys: %v", err) - } - for _, node := range keys.Node.Nodes { - if _, err := keysAPI.Delete(context.TODO(), node.Key, &etcd.DeleteOptions{Recursive: true}); err != nil { - glog.Fatalf("Unable delete key: %v", err) - } - } - -} - func deletePodOrErrorf(t *testing.T, c *client.Client, ns, name string) { if err := c.Pods(ns).Delete(name, nil); err != nil { t.Errorf("unable to delete pod %v: %v", name, err)