From c4c78475934de8c78c88b1aa21b7901572af7f69 Mon Sep 17 00:00:00 2001 From: AHMED AGHADI Date: Tue, 23 Nov 2021 19:26:07 +0530 Subject: [PATCH] Improve checks for test/e2e/common/storage --- test/e2e/common/storage/configmap_volume.go | 12 +++++++++--- test/e2e/common/storage/secrets_volume.go | 12 +++++++++--- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/test/e2e/common/storage/configmap_volume.go b/test/e2e/common/storage/configmap_volume.go index 999987551f2..2b9ea8de204 100644 --- a/test/e2e/common/storage/configmap_volume.go +++ b/test/e2e/common/storage/configmap_volume.go @@ -518,17 +518,23 @@ var _ = SIGDescribe("ConfigMap", func() { // Ensure data can't be changed now. currentConfigMap.Data["data-5"] = "value-5" _, err = f.ClientSet.CoreV1().ConfigMaps(f.Namespace.Name).Update(context.TODO(), currentConfigMap, metav1.UpdateOptions{}) - framework.ExpectEqual(apierrors.IsInvalid(err), true) + if !apierrors.IsInvalid(err) { + framework.Failf("expected 'invalid' as error, got instead: %v", err) + } // Ensure config map can't be switched from immutable to mutable. currentConfigMap, err = f.ClientSet.CoreV1().ConfigMaps(f.Namespace.Name).Get(context.TODO(), name, metav1.GetOptions{}) framework.ExpectNoError(err, "Failed to get config map %q in namespace %q", configMap.Name, configMap.Namespace) - framework.ExpectEqual(*currentConfigMap.Immutable, true) + if !*currentConfigMap.Immutable { + framework.Failf("currentConfigMap %s can be switched from immutable to mutable", currentConfigMap.Name) + } falseVal := false currentConfigMap.Immutable = &falseVal _, err = f.ClientSet.CoreV1().ConfigMaps(f.Namespace.Name).Update(context.TODO(), currentConfigMap, metav1.UpdateOptions{}) - framework.ExpectEqual(apierrors.IsInvalid(err), true) + if !apierrors.IsInvalid(err) { + framework.Failf("expected 'invalid' as error, got instead: %v", err) + } // Ensure that metadata can be changed. currentConfigMap, err = f.ClientSet.CoreV1().ConfigMaps(f.Namespace.Name).Get(context.TODO(), name, metav1.GetOptions{}) diff --git a/test/e2e/common/storage/secrets_volume.go b/test/e2e/common/storage/secrets_volume.go index d138f54b18e..0eb64350110 100644 --- a/test/e2e/common/storage/secrets_volume.go +++ b/test/e2e/common/storage/secrets_volume.go @@ -400,17 +400,23 @@ var _ = SIGDescribe("Secrets", func() { // Ensure data can't be changed now. currentSecret.Data["data-5"] = []byte("value-5\n") _, err = f.ClientSet.CoreV1().Secrets(f.Namespace.Name).Update(context.TODO(), currentSecret, metav1.UpdateOptions{}) - framework.ExpectEqual(apierrors.IsInvalid(err), true) + if !apierrors.IsInvalid(err) { + framework.Failf("expected 'invalid' as error, got instead: %v", err) + } // Ensure secret can't be switched from immutable to mutable. currentSecret, err = f.ClientSet.CoreV1().Secrets(f.Namespace.Name).Get(context.TODO(), name, metav1.GetOptions{}) framework.ExpectNoError(err, "Failed to get secret %q in namespace %q", secret.Name, secret.Namespace) - framework.ExpectEqual(*currentSecret.Immutable, true) + if !*currentSecret.Immutable { + framework.Failf("currentSecret %s can be switched from immutable to mutable", currentSecret.Name) + } falseVal := false currentSecret.Immutable = &falseVal _, err = f.ClientSet.CoreV1().Secrets(f.Namespace.Name).Update(context.TODO(), currentSecret, metav1.UpdateOptions{}) - framework.ExpectEqual(apierrors.IsInvalid(err), true) + if !apierrors.IsInvalid(err) { + framework.Failf("expected 'invalid' as error, got instead: %v", err) + } // Ensure that metadata can be changed. currentSecret, err = f.ClientSet.CoreV1().Secrets(f.Namespace.Name).Get(context.TODO(), name, metav1.GetOptions{})