diff options
| author | Zuul <zuul@review.openstack.org> | 2019-03-26 14:42:09 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-03-26 14:42:09 +0000 |
| commit | 07d76760d40e740b4e080b47117b613259219ab6 (patch) | |
| tree | 75fef8c00b977cf3a8a4bef08fd6853138be9882 | |
| parent | 28ecd11ce1fd50b04d4b5b8ed8cf952416170e80 (diff) | |
| parent | 385307b9409495305a8dfc05f10bc14b3d8a1068 (diff) | |
| download | python-cinderclient-07d76760d40e740b4e080b47117b613259219ab6.tar.gz | |
Merge "Replace assertRaisesRegexp with assertRaisesRegex" into stable/stein
| -rw-r--r-- | cinderclient/tests/unit/test_api_versions.py | 12 | ||||
| -rw-r--r-- | cinderclient/tests/unit/v2/test_shell.py | 8 |
2 files changed, 10 insertions, 10 deletions
diff --git a/cinderclient/tests/unit/test_api_versions.py b/cinderclient/tests/unit/test_api_versions.py index 24b09d0..559d814 100644 --- a/cinderclient/tests/unit/test_api_versions.py +++ b/cinderclient/tests/unit/test_api_versions.py @@ -236,12 +236,12 @@ class DiscoverVersionTestCase(utils.TestCase): api_versions.MIN_VERSION = client_min if exp_range: - self.assertRaisesRegexp(exceptions.UnsupportedVersion, - ".*range is '%s' to '%s'.*" % - (server_min, server_max), - api_versions.discover_version, - self.fake_client, - api_versions.APIVersion(requested_version)) + self.assertRaisesRegex(exceptions.UnsupportedVersion, + ".*range is '%s' to '%s'.*" % + (server_min, server_max), + api_versions.discover_version, + self.fake_client, + api_versions.APIVersion(requested_version)) else: discovered_version = api_versions.discover_version( self.fake_client, diff --git a/cinderclient/tests/unit/v2/test_shell.py b/cinderclient/tests/unit/v2/test_shell.py index 6284122..4e966dd 100644 --- a/cinderclient/tests/unit/v2/test_shell.py +++ b/cinderclient/tests/unit/v2/test_shell.py @@ -529,10 +529,10 @@ class ShellTest(utils.TestCase): def test_rename_invalid_args(self): """Ensure that error generated does not reference an HTTP code.""" - self.assertRaisesRegexp(exceptions.ClientException, - '(?!HTTP)', - self.run_command, - 'rename volume-1234-abcd') + self.assertRaisesRegex(exceptions.ClientException, + '(?!HTTP)', + self.run_command, + 'rename volume-1234-abcd') def test_rename_snapshot(self): # basic rename with positional arguments |