test feature

Author: michaelhtm

test/e2e/tests/test_db_instance.py

@@ -94,12 +94,11 @@ def postgres14_t3_micro_instance(k8s_secret):
 
     yield (ref, cr, secret.name)
 
-    # Try to delete, if doesn't already exist
-    try:
-        _, deleted = k8s.delete_custom_resource(ref, 3, 10)
-    except:
-        pass
+    k8s.delete_custom_resource(ref)
+    assert k8s.get_resource_exists(ref)
+    time.sleep(60)
     db_instance.wait_until_deleted(db_instance_id)
+    assert not k8s.get_resource_exists(ref)
 
 @service_marker
 @pytest.mark.canary

test/e2e/tests/test_references.py

@@ -287,25 +287,25 @@ def test_references(
         # we try to delete the DB Parameter Group before the DB Instance, the
         # cascading delete protection of resource references will mean the DB
         # Parameter Group won't be deleted.
-        _, deleted = k8s.delete_custom_resource(
-            db_instance_ref,
-            period_length=DELETE_INSTANCE_TIMEOUT_SECONDS,
-        )
-        assert deleted
+        k8s.delete_custom_resource(db_instance_ref)
+        # ensure db_instance does not disappear immidiately from k8s
+        assert k8s.get_resource_exists(db_instance_ref)
 
         # Wait a bit before trying to delete the cluster since the instance is
         # part of the cluster and sometimes the delete cluster complains if
         # it's too soon after deleting the last DB instance in it.
         time.sleep(60)
 
         db_instance.wait_until_deleted(db_instance_id)
+        # ensure db_instance is removed from k8s once it is removed from AWS
+        assert not k8s.get_resource_exists(db_instance_ref)
+
 
         # Same for the DB cluster because it refers to the DB cluster
         # parameter group...
-        _, deleted = k8s.delete_custom_resource(
-            db_cluster_ref,
-            period_length=DELETE_CLUSTER_TIMEOUT_SECONDS,
-        )
-        assert deleted
+        k8s.delete_custom_resource(db_cluster_ref)
+        assert k8s.get_resource_exists(db_cluster_ref)
 
+        time.sleep(60)
         db_cluster.wait_until_deleted(db_cluster_id)
+        assert not k8s.get_resource_exists(db_cluster_ref)