summaryrefslogtreecommitdiff
path: root/heatclient/tests
diff options
context:
space:
mode:
authorAndreas Jaeger <aj@suse.com>2020-03-28 15:38:59 +0100
committerAndreas Jaeger <jaegerandi@gmail.com>2020-03-31 10:04:12 +0000
commit9dede4eb2b824b21c0031507bd986796f535810c (patch)
treef7b608f8e48da9b3318137662470ef12a11d9f71 /heatclient/tests
parent6b071d397e9ba8ff81962f5709f3d14d6408dd2f (diff)
downloadpython-heatclient-9dede4eb2b824b21c0031507bd986796f535810c.tar.gz
Update hacking for Python3ussuri-em2.1.0
The repo is Python 3 now, so update hacking to version 3.0 which supports Python 3. Fix problems found. Change-Id: I82c745f5b1236844deec4538be84037a64eebeee
Diffstat (limited to 'heatclient/tests')
-rw-r--r--heatclient/tests/unit/test_deployment_utils.py6
-rw-r--r--heatclient/tests/unit/test_shell.py4
2 files changed, 5 insertions, 5 deletions
diff --git a/heatclient/tests/unit/test_deployment_utils.py b/heatclient/tests/unit/test_deployment_utils.py
index 2f9c637..1167a76 100644
--- a/heatclient/tests/unit/test_deployment_utils.py
+++ b/heatclient/tests/unit/test_deployment_utils.py
@@ -291,9 +291,9 @@ class TempURLSignalTest(testtools.TestCase):
'[a-f0-9]{3}-[a-f0-9]{12}')
url = deployment_utils.create_temp_url(swift_client, 'bar', 60)
self.assertFalse(swift_client.post_account.called)
- regexp = ("http://fake-host.com:8080/v1/AUTH_demo/bar-%s"
- "/%s\?temp_url_sig=[0-9a-f]{40}&"
- "temp_url_expires=[0-9]{10}" % (uuid_pattern, uuid_pattern))
+ regexp = (r"http://fake-host.com:8080/v1/AUTH_demo/bar-%s"
+ r"/%s\?temp_url_sig=[0-9a-f]{40}&"
+ r"temp_url_expires=[0-9]{10}" % (uuid_pattern, uuid_pattern))
self.assertThat(url, matchers.MatchesRegex(regexp))
timeout = int(url.split('=')[-1])
diff --git a/heatclient/tests/unit/test_shell.py b/heatclient/tests/unit/test_shell.py
index fcb019c..0c8b272 100644
--- a/heatclient/tests/unit/test_shell.py
+++ b/heatclient/tests/unit/test_shell.py
@@ -557,7 +557,7 @@ class ShellTestNoMox(ShellTestNoMoxBase):
template_file = os.path.join(TEST_VAR_DIR, 'minimal.template')
self.shell_error('stack-create -f %s stack' % template_file,
- 'The Parameter \(key_name\) was not provided.',
+ r'The Parameter \(key_name\) was not provided.',
exception=exc.HTTPBadRequest)
def test_event_list(self):
@@ -2437,7 +2437,7 @@ class ShellTestUserPass(ShellBase):
'{',
'"output_key": "output2"',
'"description": "test output 2"',
- '"output_value": \[',
+ r'"output_value": \[',
'"output"',
'"value"',
'"2"',