Merge "trivial: Replace assertRegexpMatches with assertRegex"

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
 

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)

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)

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'$")