From 57e41685baee97be1c2cc990c57a8017f7860600 Mon Sep 17 00:00:00 2001 From: Tim Burke Date: Thu, 15 Jul 2021 14:39:48 -0700 Subject: [PATCH] trivial: Replace assertRegexpMatches with assertRegex Change-Id: Id1ee51fea6b754042ebe5204517dd91865ffbc28 --- test/__init__.py | 1 + test/functional/s3api/test_multi_upload.py | 2 +- test/functional/s3api/test_presigned.py | 2 +- test/unit/obj/test_ssync_receiver.py | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/test/__init__.py b/test/__init__.py index f310816e33..36705e3cc9 100644 --- a/test/__init__.py +++ b/test/__init__.py @@ -46,6 +46,7 @@ warnings.filterwarnings('ignore', module='cryptography|OpenSSL', message=( if sys.version_info < (3, 2): import unittest unittest.TestCase.assertRaisesRegex = unittest.TestCase.assertRaisesRegexp + unittest.TestCase.assertRegex = unittest.TestCase.assertRegexpMatches from eventlet.green import socket diff --git a/test/functional/s3api/test_multi_upload.py b/test/functional/s3api/test_multi_upload.py index 3319e8b1ac..536b51e9d5 100644 --- a/test/functional/s3api/test_multi_upload.py +++ b/test/functional/s3api/test_multi_upload.py @@ -450,7 +450,7 @@ class TestS3ApiMultiUpload(S3ApiBase): o = resp_objects[0] self.assertEqual(o.find('Key').text, keys[0]) self.assertIsNotNone(o.find('LastModified').text) - self.assertRegexpMatches( + self.assertRegex( o.find('LastModified').text, r'^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z$') self.assertEqual(o.find('ETag').text, exp_etag) diff --git a/test/functional/s3api/test_presigned.py b/test/functional/s3api/test_presigned.py index b13fb76c63..a06206b8b8 100644 --- a/test/functional/s3api/test_presigned.py +++ b/test/functional/s3api/test_presigned.py @@ -90,7 +90,7 @@ class TestS3ApiPresignedUrls(S3ApiBase): for o in resp_objects: self.assertIn(o.find('Key').text, req_objects) self.assertIsNotNone(o.find('LastModified').text) - self.assertRegexpMatches( + self.assertRegex( o.find('LastModified').text, r'^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z$') self.assertIsNotNone(o.find('ETag').text) diff --git a/test/unit/obj/test_ssync_receiver.py b/test/unit/obj/test_ssync_receiver.py index b6f99f2a21..b943e9ac6c 100644 --- a/test/unit/obj/test_ssync_receiver.py +++ b/test/unit/obj/test_ssync_receiver.py @@ -382,7 +382,7 @@ class TestReceiver(unittest.TestCase): body_lines1, [b':MISSING_CHECK: START', b':MISSING_CHECK: END', b':UPDATES: START', b':UPDATES: END']) - self.assertRegexpMatches( + self.assertRegex( b''.join(body_lines2), br"^:ERROR: 0 '0\.0[0-9]+ seconds: " br"/.+/sda1/objects/1/.lock-replication'$")