diff options
| author | Pavlo Shchelokovskyy <shchelokovskyy@gmail.com> | 2022-06-13 18:16:41 +0300 |
|---|---|---|
| committer | Pavlo Shchelokovskyy <shchelokovskyy@gmail.com> | 2022-06-13 18:56:45 +0300 |
| commit | 66adfe14a69b00482d566ca68f55c48fab6421b2 (patch) | |
| tree | d35b32a49e03190565745e157942ee62a4aab272 | |
| parent | a12456c17c5f43a35a54e605e89f74205be1e98e (diff) | |
| download | python-heatclient-66adfe14a69b00482d566ca68f55c48fab6421b2.tar.gz | |
Encode urls in unit tests
currently several unit tests are failing when path from where
they run contains url-quotable characters like '@', which apparently is
possile in e.g. Jenkins.
Change-Id: I44eab3f4a384a27f34e4066651baafa6a9489f49
| -rw-r--r-- | heatclient/tests/unit/test_shell.py | 6 | ||||
| -rw-r--r-- | heatclient/tests/unit/test_utils.py | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/heatclient/tests/unit/test_shell.py b/heatclient/tests/unit/test_shell.py index c29a3a2..48257ec 100644 --- a/heatclient/tests/unit/test_shell.py +++ b/heatclient/tests/unit/test_shell.py @@ -1224,7 +1224,8 @@ class ShellTestUserPass(ShellBase): self.useFixture(fixtures.MockPatchObject(utils, 'read_url_content', return_value='xxxxxx')) - url = 'file://%s/private_key.env' % TEST_VAR_DIR + url = 'file://' + request.pathname2url( + '%s/private_key.env' % TEST_VAR_DIR) template_file = os.path.join(TEST_VAR_DIR, 'minimal.template') create_text = self.shell( @@ -1254,7 +1255,8 @@ class ShellTestUserPass(ShellBase): self.useFixture(fixtures.MockPatchObject(utils, 'read_url_content', return_value='xxxxxx')) - url = 'file://%s/private_key.env' % TEST_VAR_DIR + url = 'file://' + request.pathname2url( + '%s/private_key.env' % TEST_VAR_DIR) template_file = os.path.join(TEST_VAR_DIR, 'minimal.template') create_text = self.shell( diff --git a/heatclient/tests/unit/test_utils.py b/heatclient/tests/unit/test_utils.py index 9c01f49..ec700f2 100644 --- a/heatclient/tests/unit/test_utils.py +++ b/heatclient/tests/unit/test_utils.py @@ -15,6 +15,7 @@ import os from unittest import mock +from urllib import request import testtools @@ -386,7 +387,7 @@ class TestURLFunctions(testtools.TestCase): def test_normalise_file_path_to_url_relative(self): self.assertEqual( - 'file://%s/foo' % os.getcwd(), + 'file://' + request.pathname2url('%s/foo' % os.getcwd()), utils.normalise_file_path_to_url( 'foo')) |