Replace deprecated unittest aliases (#2965)

boto · Aug 18, 2021 · b4898aa · b4898aa
1 parent a4c0422
commit b4898aa
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/tests/functional/test_resource.py b/tests/functional/test_resource.py
@@ -45,7 +45,7 @@ def test_has_good_error_message_when_no_resource(self):
         err_regex = (
             '%s.*resource does not exist.' % bad_resource_name
         )
-        with self.assertRaisesRegexp(ResourceNotExistsError, err_regex):
+        with self.assertRaisesRegex(ResourceNotExistsError, err_regex):
             boto3.resource(bad_resource_name)
 
 

diff --git a/tests/unit/dynamodb/test_conditions.py b/tests/unit/dynamodb/test_conditions.py
@@ -35,17 +35,17 @@ def setUp(self):
         self.value2 = 'foo2'
 
     def test_and(self):
-        with self.assertRaisesRegexp(
+        with self.assertRaisesRegex(
                 DynamoDBOperationNotSupportedError, 'AND'):
             self.attr & self.attr2
 
     def test_or(self):
-        with self.assertRaisesRegexp(
+        with self.assertRaisesRegex(
                 DynamoDBOperationNotSupportedError, 'OR'):
             self.attr | self.attr2
 
     def test_not(self):
-        with self.assertRaisesRegexp(
+        with self.assertRaisesRegex(
                 DynamoDBOperationNotSupportedError, 'NOT'):
             ~self.attr
 
@@ -243,7 +243,7 @@ def test_and_operator(self):
 
     def test_and_operator_throws_excepetion(self):
         cond1 = Equals(self.value, self.value2)
-        with self.assertRaisesRegexp(
+        with self.assertRaisesRegex(
                 DynamoDBOperationNotSupportedError, 'AND'):
             cond1 & self.value2
 
@@ -254,7 +254,7 @@ def test_or_operator(self):
 
     def test_or_operator_throws_excepetion(self):
         cond1 = Equals(self.value, self.value2)
-        with self.assertRaisesRegexp(
+        with self.assertRaisesRegex(
                 DynamoDBOperationNotSupportedError, 'OR'):
             cond1 | self.value2
 

diff --git a/tests/unit/dynamodb/test_types.py b/tests/unit/dynamodb/test_types.py
@@ -61,7 +61,7 @@ def setUp(self):
         self.serializer = TypeSerializer()
 
     def test_serialize_unsupported_type(self):
-        with self.assertRaisesRegexp(TypeError, 'Unsupported type'):
+        with self.assertRaisesRegex(TypeError, 'Unsupported type'):
             self.serializer.serialize(object())
 
     def test_serialize_null(self):
@@ -78,13 +78,13 @@ def test_serialize_decimal(self):
             self.serializer.serialize(Decimal('1.25')), {'N': '1.25'})
 
     def test_serialize_float_error(self):
-        with self.assertRaisesRegexp(
+        with self.assertRaisesRegex(
                 TypeError,
                 'Float types are not supported. Use Decimal types instead'):
             self.serializer.serialize(1.25)
 
     def test_serialize_NaN_error(self):
-        with self.assertRaisesRegexp(
+        with self.assertRaisesRegex(
                 TypeError,
                 'Infinity and NaN not supported'):
             self.serializer.serialize(Decimal('NaN'))
@@ -155,11 +155,11 @@ def setUp(self):
         self.deserializer = TypeDeserializer()
 
     def test_deserialize_invalid_type(self):
-        with self.assertRaisesRegexp(TypeError, 'FOO is not supported'):
+        with self.assertRaisesRegex(TypeError, 'FOO is not supported'):
             self.deserializer.deserialize({'FOO': 'bar'})
 
     def test_deserialize_empty_structure(self):
-        with self.assertRaisesRegexp(TypeError, 'Value must be a nonempty'):
+        with self.assertRaisesRegex(TypeError, 'Value must be a nonempty'):
             self.assertEqual(self.deserializer.deserialize({}), {})
 
     def test_deserialize_null(self):

diff --git a/tests/unit/resources/test_factory.py b/tests/unit/resources/test_factory.py
@@ -685,8 +685,8 @@ def test_hash_resource_not_equal(self):
         p = resource.Queue('test1')
         q = resource.Queue('test2')
 
-        self.assertNotEquals(p, q, "Should not be equal resource")
-        self.assertNotEquals(hash(p), hash(q), "Hash values should be different")
+        self.assertNotEqual(p, q, "Should not be equal resource")
+        self.assertNotEqual(hash(p), hash(q), "Hash values should be different")
 
     def test_dangling_resource_create_with_kwarg(self):
         resource = self.load('test', self.model, self.defs)()