github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-31 23:37:01 +00:00
Code Issues Projects Releases Wiki Activity

merged recycler+deleter tests so they run serially

Browse Source
This commit is contained in:
markturansky 2015-09-22 13:28:53 -04:00
parent 6dca2a4e7f
commit d2e8ec934c
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
test/integration/persistent_volumes_test.go
View File

@ -89,21 +89,10 @@ func TestPersistentVolumeRecycler(t *testing.T) {
waitForPersistentVolumePhase(watch, api.VolumeReleased) waitForPersistentVolumePhase(watch, api.VolumeReleased)
waitForPersistentVolumePhase(watch, api.VolumeAvailable) waitForPersistentVolumePhase(watch, api.VolumeAvailable)
}
func waitForPersistentVolumePhase(w watch.Interface, phase api.PersistentVolumePhase) { // end of Recycler test.
for { // Deleter test begins now.
event := <-w.ResultChan() // tests are serial because running masters concurrently that delete keys may cause similar tests to time out
volume := event.Object.(*api.PersistentVolume)
if volume.Status.Phase == phase {
break
}
}
}
func TestPersistentVolumeDeleter(t *testing.T) {
_, s := runAMaster(t)
defer s.Close()
deleteAllEtcdKeys() deleteAllEtcdKeys()
binderClient := client.NewOrDie(&client.Config{Host: s.URL, Version: testapi.Default.Version()}) 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
}
}
}