diff options
| author | Zuul <zuul@review.opendev.org> | 2021-11-20 01:59:54 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-11-20 01:59:54 +0000 |
| commit | 1950b72eadc5b9373e5e0f77f7b73446c426e854 (patch) | |
| tree | ab6bd46576ec02599144695153abfa9da82f42d3 | |
| parent | 0e16095a80c28c86dcb0a4fa2be4370b8ee9116b (diff) | |
| parent | 0b973a3cfe41751cbd5b433bf9fc1e1ca3737f1c (diff) | |
| download | designate-1950b72eadc5b9373e5e0f77f7b73446c426e854.tar.gz | |
Merge "Replace deprecated assertRaisesRegexp"
| -rw-r--r-- | designate/tests/test_central/test_decorator.py | 2 | ||||
| -rw-r--r-- | designate/tests/unit/backend/test_ns1.py | 4 | ||||
| -rw-r--r-- | designate/tests/unit/backend/test_pdns4.py | 8 | ||||
| -rw-r--r-- | designate/tests/unit/workers/test_zone_tasks.py | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/designate/tests/test_central/test_decorator.py b/designate/tests/test_central/test_decorator.py index 5c4515e0..66472cca 100644 --- a/designate/tests/test_central/test_decorator.py +++ b/designate/tests/test_central/test_decorator.py @@ -67,7 +67,7 @@ class CentralDecoratorTests(CentralTestCase): def mock_not_creating_new_zone(cls, context, record): pass - self.assertRaisesRegexp( + self.assertRaisesRegex( Exception, 'Failed to determine zone id for ' 'synchronized operation', diff --git a/designate/tests/unit/backend/test_ns1.py b/designate/tests/unit/backend/test_ns1.py index 3047d14b..9b565bd9 100644 --- a/designate/tests/unit/backend/test_ns1.py +++ b/designate/tests/unit/backend/test_ns1.py @@ -159,7 +159,7 @@ class NS1BackendTestCase(designate.tests.TestCase): status_code=404, ) - self.assertRaisesRegexp( + self.assertRaisesRegex( exceptions.Backend, '500 Server Error: None for url: ' '%s' % self.api_address, @@ -207,7 +207,7 @@ class NS1BackendTestCase(designate.tests.TestCase): req_mock.delete(self.api_address, status_code=500) req_mock.get(self.api_address, status_code=200) - self.assertRaisesRegexp( + self.assertRaisesRegex( exceptions.Backend, '500 Server Error: None for url: ' '%s' % self.api_address, diff --git a/designate/tests/unit/backend/test_pdns4.py b/designate/tests/unit/backend/test_pdns4.py index 9672b4b7..f00aebfe 100644 --- a/designate/tests/unit/backend/test_pdns4.py +++ b/designate/tests/unit/backend/test_pdns4.py @@ -161,7 +161,7 @@ class PDNS4BackendTestCase(designate.tests.TestCase): status_code=500, ) - self.assertRaisesRegexp( + self.assertRaisesRegex( exceptions.Backend, '500 Server Error: None for url: ' '%s/localhost/zones' % self.base_address, @@ -229,7 +229,7 @@ class PDNS4BackendTestCase(designate.tests.TestCase): status_code=404, ) - self.assertRaisesRegexp( + self.assertRaisesRegex( exceptions.Backend, '500 Server Error: None for url: ' '%s/localhost/zones' % self.base_address, @@ -255,7 +255,7 @@ class PDNS4BackendTestCase(designate.tests.TestCase): status_code=500, ) - self.assertRaisesRegexp( + self.assertRaisesRegex( exceptions.Backend, '500 Server Error: None for url: ' '%s/localhost/zones' % self.base_address, @@ -326,7 +326,7 @@ class PDNS4BackendTestCase(designate.tests.TestCase): status_code=200, ) - self.assertRaisesRegexp( + self.assertRaisesRegex( exceptions.Backend, '500 Server Error: None for url: ' '%s/localhost/zones' % self.base_address, diff --git a/designate/tests/unit/workers/test_zone_tasks.py b/designate/tests/unit/workers/test_zone_tasks.py index 1b209862..6ed2893e 100644 --- a/designate/tests/unit/workers/test_zone_tasks.py +++ b/designate/tests/unit/workers/test_zone_tasks.py @@ -312,7 +312,7 @@ class TestZoneActor(oslotest.base.BaseTestCase): ) def test_invalid_action(self): - self.assertRaisesRegexp( + self.assertRaisesRegex( exceptions.BadAction, 'Unexpected action: BAD', self.actor._validate_action, 'BAD' ) |