From d2e8ec934c305252c1c5746733f453c2e4b54b10 Mon Sep 17 00:00:00 2001
From: markturansky <mturansk@redhat.com>
Date: Tue, 22 Sep 2015 13:28:53 -0400
Subject: [PATCH] merged recycler+deleter tests so they run serially

---
 test/integration/persistent_volumes_test.go | 27 ++++++++++-----------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/test/integration/persistent_volumes_test.go b/test/integration/persistent_volumes_test.go
index 8e9d85fc571..34783ffc080 100644
--- a/test/integration/persistent_volumes_test.go
+++ b/test/integration/persistent_volumes_test.go
@@ -89,21 +89,10 @@ func TestPersistentVolumeRecycler(t *testing.T) {
 
 	waitForPersistentVolumePhase(watch, api.VolumeReleased)
 	waitForPersistentVolumePhase(watch, api.VolumeAvailable)
-}
 
-func waitForPersistentVolumePhase(w watch.Interface, phase api.PersistentVolumePhase) {
-	for {
-		event := <-w.ResultChan()
-		volume := event.Object.(*api.PersistentVolume)
-		if volume.Status.Phase == phase {
-			break
-		}
-	}
-}
-
-func TestPersistentVolumeDeleter(t *testing.T) {
-	_, s := runAMaster(t)
-	defer s.Close()
+	// end of Recycler test.
+	// Deleter test begins now.
+	// tests are serial because running masters concurrently that delete keys may cause similar tests to time out
 
 	deleteAllEtcdKeys()
 	binderClient := client.NewOrDie(&client.Config{Host: s.URL, Version: testapi.Default.Version()})
@@ -160,3 +149,13 @@ func TestPersistentVolumeDeleter(t *testing.T) {
 		}
 	}
 }
+
+func waitForPersistentVolumePhase(w watch.Interface, phase api.PersistentVolumePhase) {
+	for {
+		event := <-w.ResultChan()
+		volume := event.Object.(*api.PersistentVolume)
+		if volume.Status.Phase == phase {
+			break
+		}
+	}
+}