fix: error messages changed in Python 3.12

aws · Oct 30, 2023 · fb16f5b · fb16f5b
1 parent 0dd7083
commit fb16f5b
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 20 deletions.
diff --git a/test/unit/test_caches_base.py b/test/unit/test_caches_base.py
@@ -19,18 +19,16 @@
 
 
 def test_abstracts():
-    with pytest.raises(TypeError) as excinfo:
+    with pytest.raises(TypeError, match='instantiate abstract class CryptoMaterialsCache') as excinfo:
         CryptoMaterialsCache()
 
-    excinfo.match(
-        r"Can't instantiate abstract class CryptoMaterialsCache with abstract methods {}".format(
-            ", ".join(
-                [
-                    "get_decryption_materials",
-                    "get_encryption_materials",
-                    "put_decryption_materials",
-                    "put_encryption_materials",
-                ]
-            )
-        )
-    )
+    exception = str(excinfo.value)
+    method_names = [
+        "get_decryption_materials",
+        "get_encryption_materials",
+        "put_decryption_materials",
+        "put_encryption_materials"
+    ]
+    for name in method_names:
+        if exception.rfind(name) == -1:
+            raise AssertionError("{} missing from Exception Message".format(name))
diff --git a/test/unit/test_material_managers_base.py b/test/unit/test_material_managers_base.py
@@ -19,11 +19,10 @@
 
 
 def test_abstracts():
-    with pytest.raises(TypeError) as excinfo:
+    with pytest.raises(TypeError, match='instantiate abstract class CryptoMaterialsManager') as excinfo:
         CryptoMaterialsManager()
-
-    excinfo.match(
-        r"Can't instantiate abstract class CryptoMaterialsManager with abstract methods {}".format(
-            ", ".join(["decrypt_materials", "get_encryption_materials"])
-        )
-    )
+    method_names = ["decrypt_materials", "get_encryption_materials"]
+    exception = str(excinfo.value)
+    for name in method_names:
+        if exception.rfind(name) == -1:
+            raise AssertionError("{} missing from Exception Message".format(name))