From c49de856a08fae3d8ac5f28a0b026f8ae8a7dd36 Mon Sep 17 00:00:00 2001
From: Ryan Ly <rly@lbl.gov>
Date: Wed, 5 Jan 2022 10:36:54 -0800
Subject: [PATCH 1/2] Do not test against base Python error message

---
 tests/unit/common/test_table.py            | 4 ++--
 tests/unit/test_container.py               | 4 ++--
 tests/unit/utils_test/test_labelleddict.py | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/unit/common/test_table.py b/tests/unit/common/test_table.py
index 2471fdf6..bb789968 100644
--- a/tests/unit/common/test_table.py
+++ b/tests/unit/common/test_table.py
@@ -918,7 +918,7 @@ def test_getitem_oor(self):
             self._getitem(12)
 
     def test_getitem_badcol(self):
-        with self.assertRaisesWith(KeyError, '\'boo\''):
+        with self.assertRaises(KeyError):
             self._getitem('boo')
 
     def _assert_two_elem_df(self, rec):
@@ -1163,7 +1163,7 @@ def test_init(self):
         self.assertIsNone(table.col11_index)
 
         # uninitialized optional predefined columns cannot be accessed in this manner
-        with self.assertRaisesWith(KeyError, "'col2'"):
+        with self.assertRaises(KeyError):
             table['col2']
 
     def test_gather_columns_inheritance(self):
diff --git a/tests/unit/test_container.py b/tests/unit/test_container.py
index 28b31009..a062d104 100644
--- a/tests/unit/test_container.py
+++ b/tests/unit/test_container.py
@@ -345,7 +345,7 @@ class NamedFieldsNotSettable(AbstractContainer):
         obj = NamedFieldsNotSettable('test name')
 
         obj.field1 = 'field1 value'
-        with self.assertRaisesWith(AttributeError, "can't set attribute"):
+        with self.assertRaises(AttributeError):
             obj.field2 = 'field2 value'
 
     def test_inheritance(self):
@@ -379,7 +379,7 @@ class NamedFieldsChild(NamedFields):
         self.assertEqual(ret[0], {'name': 'field1', 'doc': 'overridden field', 'settable': False})
 
         # obj = NamedFieldsChild('test name')
-        # with self.assertRaisesWith(AttributeError, "can't set attribute"):
+        # with self.assertRaises(AttributeError):
         #     obj.field1 = 'field1 value'
 
     def test_mult_inheritance_base_mixin(self):
diff --git a/tests/unit/utils_test/test_labelleddict.py b/tests/unit/utils_test/test_labelleddict.py
index 966b338f..32597598 100644
--- a/tests/unit/utils_test/test_labelleddict.py
+++ b/tests/unit/utils_test/test_labelleddict.py
@@ -39,7 +39,7 @@ def test_set_key_attr(self):
     def test_getitem_unknown_val(self):
         """Test that dict[unknown_key] where the key unknown_key is not in the dict raises an error."""
         ld = LabelledDict(label='all_objects', key_attr='prop1')
-        with self.assertRaisesWith(KeyError, "'unknown_key'"):
+        with self.assertRaises(KeyError):
             ld['unknown_key']
 
     def test_getitem_eqeq_unknown_val(self):
@@ -161,7 +161,7 @@ def test_getitem_eqeq_nonempty_key_attr_no_match(self):
         ld = LabelledDict(label='all_objects', key_attr='prop1')
         obj1 = MyTestClass('a', 'b')
         ld.add(obj1)
-        with self.assertRaisesWith(KeyError, "'unknown_val'"):
+        with self.assertRaises(KeyError):
             ld['prop1 == unknown_val']  # same as ld['unknown_val']
 
     def test_getitem_eqeq_nonempty_unknown_attr(self):