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 + } + } +}