diff options
| author | Zuul <zuul@review.opendev.org> | 2022-03-24 00:33:27 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-03-24 00:33:27 +0000 |
| commit | 0651d8175d627841051190d76b8fdf5f9c48b4c0 (patch) | |
| tree | 2068d9b52baa7cafdc58b412a548a3cd9e1b799c /test | |
| parent | 7ec2036db9866c8077bd09f11c8cc7f00d225f77 (diff) | |
| parent | 57e41685baee97be1c2cc990c57a8017f7860600 (diff) | |
| download | swift-0651d8175d627841051190d76b8fdf5f9c48b4c0.tar.gz | |
Merge "trivial: Replace assertRegexpMatches with assertRegex"
Diffstat (limited to 'test')
| -rw-r--r-- | test/__init__.py | 1 | ||||
| -rw-r--r-- | test/functional/s3api/test_multi_upload.py | 2 | ||||
| -rw-r--r-- | test/functional/s3api/test_presigned.py | 2 | ||||
| -rw-r--r-- | 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 cf7347c63..959cb6755 100644 --- a/test/__init__.py +++ b/test/__init__.py @@ -50,6 +50,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 4f0e98bcb..c1c07cc1c 100644 --- a/test/functional/s3api/test_multi_upload.py +++ b/test/functional/s3api/test_multi_upload.py @@ -485,7 +485,7 @@ class TestS3ApiMultiUpload(S3ApiBase): expected_key = keys[0] self.assertEqual(o.find('Key').text, expected_key) 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 b13fb76c6..a06206b8b 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 b6f99f2a2..b943e9ac6 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'$") |