Skip to content

Commit b4898aa

Browse files
authored
Replace deprecated unittest aliases (#2965)
1 parent a4c0422 commit b4898aa

4 files changed

Lines changed: 13 additions & 13 deletions

File tree

‎tests/functional/test_resource.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ def test_has_good_error_message_when_no_resource(self):
4545
err_regex = (
4646
'%s.*resource does not exist.' % bad_resource_name
4747
)
48-
with self.assertRaisesRegexp(ResourceNotExistsError, err_regex):
48+
with self.assertRaisesRegex(ResourceNotExistsError, err_regex):
4949
boto3.resource(bad_resource_name)
5050

5151

‎tests/unit/dynamodb/test_conditions.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,17 +35,17 @@ def setUp(self):
3535
self.value2 = 'foo2'
3636

3737
def test_and(self):
38-
with self.assertRaisesRegexp(
38+
with self.assertRaisesRegex(
3939
DynamoDBOperationNotSupportedError, 'AND'):
4040
self.attr & self.attr2
4141

4242
def test_or(self):
43-
with self.assertRaisesRegexp(
43+
with self.assertRaisesRegex(
4444
DynamoDBOperationNotSupportedError, 'OR'):
4545
self.attr | self.attr2
4646

4747
def test_not(self):
48-
with self.assertRaisesRegexp(
48+
with self.assertRaisesRegex(
4949
DynamoDBOperationNotSupportedError, 'NOT'):
5050
~self.attr
5151

@@ -243,7 +243,7 @@ def test_and_operator(self):
243243

244244
def test_and_operator_throws_excepetion(self):
245245
cond1 = Equals(self.value, self.value2)
246-
with self.assertRaisesRegexp(
246+
with self.assertRaisesRegex(
247247
DynamoDBOperationNotSupportedError, 'AND'):
248248
cond1 & self.value2
249249

@@ -254,7 +254,7 @@ def test_or_operator(self):
254254

255255
def test_or_operator_throws_excepetion(self):
256256
cond1 = Equals(self.value, self.value2)
257-
with self.assertRaisesRegexp(
257+
with self.assertRaisesRegex(
258258
DynamoDBOperationNotSupportedError, 'OR'):
259259
cond1 | self.value2
260260

‎tests/unit/dynamodb/test_types.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ def setUp(self):
6161
self.serializer = TypeSerializer()
6262

6363
def test_serialize_unsupported_type(self):
64-
with self.assertRaisesRegexp(TypeError, 'Unsupported type'):
64+
with self.assertRaisesRegex(TypeError, 'Unsupported type'):
6565
self.serializer.serialize(object())
6666

6767
def test_serialize_null(self):
@@ -78,13 +78,13 @@ def test_serialize_decimal(self):
7878
self.serializer.serialize(Decimal('1.25')), {'N': '1.25'})
7979

8080
def test_serialize_float_error(self):
81-
with self.assertRaisesRegexp(
81+
with self.assertRaisesRegex(
8282
TypeError,
8383
'Float types are not supported. Use Decimal types instead'):
8484
self.serializer.serialize(1.25)
8585

8686
def test_serialize_NaN_error(self):
87-
with self.assertRaisesRegexp(
87+
with self.assertRaisesRegex(
8888
TypeError,
8989
'Infinity and NaN not supported'):
9090
self.serializer.serialize(Decimal('NaN'))
@@ -155,11 +155,11 @@ def setUp(self):
155155
self.deserializer = TypeDeserializer()
156156

157157
def test_deserialize_invalid_type(self):
158-
with self.assertRaisesRegexp(TypeError, 'FOO is not supported'):
158+
with self.assertRaisesRegex(TypeError, 'FOO is not supported'):
159159
self.deserializer.deserialize({'FOO': 'bar'})
160160

161161
def test_deserialize_empty_structure(self):
162-
with self.assertRaisesRegexp(TypeError, 'Value must be a nonempty'):
162+
with self.assertRaisesRegex(TypeError, 'Value must be a nonempty'):
163163
self.assertEqual(self.deserializer.deserialize({}), {})
164164

165165
def test_deserialize_null(self):

‎tests/unit/resources/test_factory.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -685,8 +685,8 @@ def test_hash_resource_not_equal(self):
685685
p = resource.Queue('test1')
686686
q = resource.Queue('test2')
687687

688-
self.assertNotEquals(p, q, "Should not be equal resource")
689-
self.assertNotEquals(hash(p), hash(q), "Hash values should be different")
688+
self.assertNotEqual(p, q, "Should not be equal resource")
689+
self.assertNotEqual(hash(p), hash(q), "Hash values should be different")
690690

691691
def test_dangling_resource_create_with_kwarg(self):
692692
resource = self.load('test', self.model, self.defs)()

0 commit comments

Comments
 (0)