wip: improve test setup error handling

Author: Shu Shen

tests/integration/integration_test_base.py

@@ -32,14 +32,19 @@ def __init__(self, ledger_name, region):
     def force_delete_ledger(self):
         try:
             logger.info("Deleting ledger %s", self.ledger_name)
-            self.qldb.update_ledger(Name=self.ledger_name, DeletionProtection=False)
             self.delete_ledger()
-        except ClientError as ce:
-            logger.warning("Encountered an error while force deleting ledger %s: %s", self.ledger_name, ce)
+        except (self.qldb.exceptions.ResourceInUseException, self.qldb.exceptions.ResourcePreconditionNotMetException) as e:
+            logger.warning(e)
+            # Test deleting state
+            self.wait_for_active()
+            self.delete_ledger()
 
     def delete_ledger(self):
         logger.info("Deleting ledger %s", self.ledger_name)
-        self.qldb.update_ledger(Name=self.ledger_name, DeletionProtection=False)
+        try:
+            self.qldb.update_ledger(Name=self.ledger_name, DeletionProtection=False)
+        except self.qldb.exceptions.ResourceNotFoundException:
+            return
         self.qldb.delete_ledger(Name=self.ledger_name)
         self.wait_for_deletion()
 

tests/integration/test_session_management.py

@@ -30,7 +30,7 @@ def setUpClass(cls):
 
     @classmethod
     def tearDownClass(cls):
-        cls.integration_test_base.delete_ledger()
+        cls.integration_test_base.force_delete_ledger()
 
     def test_connect_to_non_existent_ledger(self):
         with self.integration_test_base.qldb_driver("nonExistentLedger") as qldb_driver: