openstack/python-ironicclient
Code Issues Proposed changes

Use assertRegex instead of assertRegexpMatches

Browse Source 
In Python3, assertRegexpMatches & assertNotRegexpMatches
are deprecated in favor of assertRegex and assertNotRegex.

Change-Id: I273a5efb7b901996a2e80db6edadead67d2d7016
This commit is contained in:
Nam Nguyen Hoai
2017-11-30 13:09:48 +07:00
parent dafe5381b9
commit 0d4d2f0d64
1 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ironicclient/tests/unit/test_shell.py
View File

@@ -382,17 +382,6 @@ class TestCase(testtools.TestCase):
self.useFixture( self.useFixture(
fixtures.EnvironmentVariable(key, fake_env.get(key))) fixtures.EnvironmentVariable(key, fake_env.get(key)))
# required for testing with Python 2.6
def assertRegexpMatches(self, text, expected_regexp, msg=None):
"""Fail the test unless the text matches the regular expression."""
if isinstance(expected_regexp, six.string_types):
expected_regexp = re.compile(expected_regexp)
if not expected_regexp.search(text):
msg = msg or "Regexp didn't match"
msg = '%s: %r not found in %r' % (
msg, expected_regexp.pattern, text)
raise self.failureException(msg)
def register_keystone_v2_token_fixture(self, request_mocker): def register_keystone_v2_token_fixture(self, request_mocker):
v2_token = ks_fixture.V2Token() v2_token = ks_fixture.V2Token()
service = v2_token.add_service('baremetal') service = v2_token.add_service('baremetal')
@@ -479,7 +468,7 @@ class ShellTestNoMox(TestCase):
] ]
for r in required: for r in required:
self.assertRegexpMatches(event_list_text, r) self.assertRegex(event_list_text, r)
class ShellTestNoMoxV3(ShellTestNoMox): class ShellTestNoMoxV3(ShellTestNoMox):