openstack/swift
Code Issues Proposed changes

Merge "trivial: Replace assertRegexpMatches with assertRegex"

Browse Source
This commit is contained in:
Zuul
2022-03-24 00:33:27 +00:00
committed by Gerrit Code Review
parent 7ec2036db9 57e41685ba
commit 0651d8175d
4 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
test/__init__.py
View File

@@ -50,6 +50,7 @@ warnings.filterwarnings('ignore', module='cryptography|OpenSSL', message=(
if sys.version_info < (3, 2): if sys.version_info < (3, 2):
import unittest import unittest
unittest.TestCase.assertRaisesRegex = unittest.TestCase.assertRaisesRegexp unittest.TestCase.assertRaisesRegex = unittest.TestCase.assertRaisesRegexp
unittest.TestCase.assertRegex = unittest.TestCase.assertRegexpMatches
from eventlet.green import socket from eventlet.green import socket

2
test/functional/s3api/test_multi_upload.py
View File

@@ -485,7 +485,7 @@ class TestS3ApiMultiUpload(S3ApiBase):
expected_key = keys[0] expected_key = keys[0]
self.assertEqual(o.find('Key').text, expected_key) self.assertEqual(o.find('Key').text, expected_key)
self.assertIsNotNone(o.find('LastModified').text) self.assertIsNotNone(o.find('LastModified').text)
self.assertRegexpMatches( self.assertRegex(
o.find('LastModified').text, o.find('LastModified').text,
r'^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z$') 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) self.assertEqual(o.find('ETag').text, exp_etag)

2
test/functional/s3api/test_presigned.py
View File

@@ -90,7 +90,7 @@ class TestS3ApiPresignedUrls(S3ApiBase):
for o in resp_objects: for o in resp_objects:
self.assertIn(o.find('Key').text, req_objects) self.assertIn(o.find('Key').text, req_objects)
self.assertIsNotNone(o.find('LastModified').text) self.assertIsNotNone(o.find('LastModified').text)
self.assertRegexpMatches( self.assertRegex(
o.find('LastModified').text, o.find('LastModified').text,
r'^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z$') r'^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z$')
self.assertIsNotNone(o.find('ETag').text) self.assertIsNotNone(o.find('ETag').text)

2
test/unit/obj/test_ssync_receiver.py
View File

@@ -382,7 +382,7 @@ class TestReceiver(unittest.TestCase):
body_lines1, body_lines1,
[b':MISSING_CHECK: START', b':MISSING_CHECK: END', [b':MISSING_CHECK: START', b':MISSING_CHECK: END',
b':UPDATES: START', b':UPDATES: END']) b':UPDATES: START', b':UPDATES: END'])
self.assertRegexpMatches( self.assertRegex(
b''.join(body_lines2), b''.join(body_lines2),
br"^:ERROR: 0 '0\.0[0-9]+ seconds: " br"^:ERROR: 0 '0\.0[0-9]+ seconds: "
br"/.+/sda1/objects/1/.lock-replication'$") br"/.+/sda1/objects/1/.lock-replication'$")