Skip to content

Commit

Permalink
Merge pull request #26262 from jsafrane/integration-error-checks
Browse files Browse the repository at this point in the history
Automatic merge from submit-queue

Add error checks to volume integration tests

We need to know what's going on when a test fails, like in #26256
  • Loading branch information
k8s-merge-robot committed May 26, 2016
2 parents 44de311 + e760353 commit 9aace46
Showing 1 changed file with 53 additions and 13 deletions.
66 changes: 53 additions & 13 deletions test/integration/persistent_volumes_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,21 @@ func TestPersistentVolumeRecycler(t *testing.T) {

pvc := createPVC("fake-pvc", "5G", []api.PersistentVolumeAccessMode{api.ReadWriteOnce})

w, _ := testClient.PersistentVolumes().Watch(api.ListOptions{})
w, err := testClient.PersistentVolumes().Watch(api.ListOptions{})
if err != nil {
t.Errorf("Failed to watch PersistentVolumes: %v", err)
}
defer w.Stop()

_, _ = testClient.PersistentVolumes().Create(pv)
_, _ = testClient.PersistentVolumeClaims(api.NamespaceDefault).Create(pvc)
_, err = testClient.PersistentVolumes().Create(pv)
if err != nil {
t.Errorf("Failed to create PersistentVolume: %v", err)
}

_, err = testClient.PersistentVolumeClaims(api.NamespaceDefault).Create(pvc)
if err != nil {
t.Errorf("Failed to create PersistentVolumeClaim: %v", err)
}

// wait until the controller pairs the volume and claim
waitForPersistentVolumePhase(w, api.VolumeBound)
Expand All @@ -85,11 +95,20 @@ func TestPersistentVolumeRecycler(t *testing.T) {
// change the reclamation policy of the PV for the next test
pv.Spec.PersistentVolumeReclaimPolicy = api.PersistentVolumeReclaimDelete

w, _ = testClient.PersistentVolumes().Watch(api.ListOptions{})
w, err = testClient.PersistentVolumes().Watch(api.ListOptions{})
if err != nil {
t.Errorf("Failed to watch PersistentVolumes: %v", err)
}
defer w.Stop()

_, _ = testClient.PersistentVolumes().Create(pv)
_, _ = testClient.PersistentVolumeClaims(api.NamespaceDefault).Create(pvc)
_, err = testClient.PersistentVolumes().Create(pv)
if err != nil {
t.Errorf("Failed to create PersistentVolume: %v", err)
}
_, err = testClient.PersistentVolumeClaims(api.NamespaceDefault).Create(pvc)
if err != nil {
t.Errorf("Failed to create PersistentVolumeClaim: %v", err)
}

waitForPersistentVolumePhase(w, api.VolumeBound)

Expand Down Expand Up @@ -171,14 +190,23 @@ func TestPersistentVolumeMultiPVs(t *testing.T) {

pvc := createPVC("pvc-2", strconv.Itoa(maxPVs/2)+"G", []api.PersistentVolumeAccessMode{api.ReadWriteOnce})

w, _ := testClient.PersistentVolumes().Watch(api.ListOptions{})
w, err := testClient.PersistentVolumes().Watch(api.ListOptions{})
if err != nil {
t.Errorf("Failed to watch PersistentVolumes: %v", err)
}
defer w.Stop()

for i := 0; i < maxPVs; i++ {
_, _ = testClient.PersistentVolumes().Create(pvs[i])
_, err = testClient.PersistentVolumes().Create(pvs[i])
if err != nil {
t.Errorf("Failed to create PersistentVolume %d: %v", i, err)
}
}

_, _ = testClient.PersistentVolumeClaims(api.NamespaceDefault).Create(pvc)
_, err = testClient.PersistentVolumeClaims(api.NamespaceDefault).Create(pvc)
if err != nil {
t.Errorf("Failed to create PersistentVolumeClaim: %v", err)
}

// wait until the controller pairs the volume and claim
waitForPersistentVolumePhase(w, api.VolumeBound)
Expand Down Expand Up @@ -236,13 +264,25 @@ func TestPersistentVolumeMultiPVsDiffAccessModes(t *testing.T) {

pvc := createPVC("pvc-rwm", "5G", []api.PersistentVolumeAccessMode{api.ReadWriteMany})

w, _ := testClient.PersistentVolumes().Watch(api.ListOptions{})
w, err := testClient.PersistentVolumes().Watch(api.ListOptions{})
if err != nil {
t.Errorf("Failed to watch PersistentVolumes: %v", err)
}
defer w.Stop()

_, _ = testClient.PersistentVolumes().Create(pv_rwm)
_, _ = testClient.PersistentVolumes().Create(pv_rwo)
_, err = testClient.PersistentVolumes().Create(pv_rwm)
if err != nil {
t.Errorf("Failed to create PersistentVolume: %v", err)
}
_, err = testClient.PersistentVolumes().Create(pv_rwo)
if err != nil {
t.Errorf("Failed to create PersistentVolume: %v", err)
}

_, _ = testClient.PersistentVolumeClaims(api.NamespaceDefault).Create(pvc)
_, err = testClient.PersistentVolumeClaims(api.NamespaceDefault).Create(pvc)
if err != nil {
t.Errorf("Failed to create PersistentVolumeClaim: %v", err)
}

// wait until the controller pairs the volume and claim
waitForPersistentVolumePhase(w, api.VolumeBound)
Expand Down

0 comments on commit 9aace46

Please sign in to comment.