Merge pull request #133 from wnxn/master

Fix listsnapshot clean up
kubernetes-csi · Nov 8, 2018 · 93231de · 93231de
2 parents 10d6320 + 04c574e
commit 93231de
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/pkg/sanity/controller.go b/pkg/sanity/controller.go
@@ -1205,15 +1205,15 @@ var _ = DescribeSanity("ListSnapshots [Controller Server]", func(sc *SanityConte
 		verifySnapshotInfo(snapshots.GetEntries()[0].GetSnapshot())
 		Expect(snapshots.GetEntries()[0].GetSnapshot().GetId()).To(Equal(snapshot.GetSnapshot().GetId()))
 
-		By("cleaning up deleting the volume")
-		delVolReq := MakeDeleteVolumeReq(sc, volume.GetVolume().GetId())
-		_, err = c.DeleteVolume(context.Background(), delVolReq)
-		Expect(err).NotTo(HaveOccurred())
-
 		By("cleaning up deleting the snapshot")
 		delSnapReq := MakeDeleteSnapshotReq(sc, snapshot.GetSnapshot().GetId())
 		_, err = c.DeleteSnapshot(context.Background(), delSnapReq)
 		Expect(err).NotTo(HaveOccurred())
+
+		By("cleaning up deleting the volume")
+		delVolReq := MakeDeleteVolumeReq(sc, volume.GetVolume().GetId())
+		_, err = c.DeleteVolume(context.Background(), delVolReq)
+		Expect(err).NotTo(HaveOccurred())
 	})
 
 	It("should return empty when the specify snapshot id is not exist", func() {