From 3362a65085b562632ce15c25ad29f0fda2a67784 Mon Sep 17 00:00:00 2001 From: zhangyangyang Date: Wed, 29 Aug 2018 14:14:49 +0800 Subject: [PATCH] Replace assertRaisesRegexp with assertRaisesRegex This replaces the deprecated (in python 3.2) unittest.TestCase method assertRaisesRegexp() with assertRaisesRegex(). Change-Id: I85025ad141f8436913ba192716435ce63e1e2d05 --- cinderclient/tests/unit/test_api_versions.py | 12 ++++++------ 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 24b09d0c4..559d81427 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 fd301a6d4..6d0782643 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