From e517ac96aac7f67ea10c422afe8ea2ba57e5fc3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Han?= Date: Mon, 20 Jul 2020 14:38:22 +0200 Subject: [PATCH] ceph: fail if the pool fails to be deleted MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Let's assert if the pool is still present. Signed-off-by: Sébastien Han --- tests/framework/clients/block.go | 8 +++++++- tests/integration/ceph_flex_test.go | 6 ++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/tests/framework/clients/block.go b/tests/framework/clients/block.go index 96a97a4b7..adb64776e 100644 --- a/tests/framework/clients/block.go +++ b/tests/framework/clients/block.go @@ -22,6 +22,7 @@ import ( "github.com/rook/rook/pkg/daemon/ceph/client" "github.com/rook/rook/tests/framework/installer" "github.com/rook/rook/tests/framework/utils" + "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) @@ -85,7 +86,12 @@ func (b *BlockOperation) DeletePVC(namespace, claimName string) error { func (b *BlockOperation) DeleteStorageClass(storageClassName string) error { logger.Infof("deleting storage class %q", storageClassName) - return b.k8sClient.Clientset.StorageV1().StorageClasses().Delete(storageClassName, &metav1.DeleteOptions{}) + err := b.k8sClient.Clientset.StorageV1().StorageClasses().Delete(storageClassName, &metav1.DeleteOptions{}) + if err != nil && !errors.IsNotFound(err) { + return fmt.Errorf("failed to delete storage class %q. %v", storageClassName, err) + } + + return nil } // BlockDelete Function to delete a Block using Rook diff --git a/tests/integration/ceph_flex_test.go b/tests/integration/ceph_flex_test.go index a785d1e34..6540685dd 100644 --- a/tests/integration/ceph_flex_test.go +++ b/tests/integration/ceph_flex_test.go @@ -173,8 +173,10 @@ func (s *CephFlexDriverSuite) statefulSetDataCleanup(poolName, storageClassName, // Delete all PVCs s.kh.DeletePvcWithLabel(defaultNamespace, statefulSetName) // Delete storageclass and pool - s.testClient.PoolClient.DeletePool(s.testClient.BlockClient, s.clusterInfo, poolName) - s.testClient.BlockClient.DeleteStorageClass(storageClassName) + err := s.testClient.PoolClient.DeletePool(s.testClient.BlockClient, s.clusterInfo, poolName) + require.Nil(s.T(), err) + err = s.testClient.BlockClient.DeleteStorageClass(storageClassName) + require.Nil(s.T(), err) } func (s *CephFlexDriverSuite) setupPVCs() {