diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2017-02-14 11:16:22 +0100 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2017-02-14 11:24:07 +0100 |
| commit | 4c142226db85c89c5459737715223b7be30bd17e (patch) | |
| tree | 2647e89f0ddeb629fe6548ab56f0c4c88697a39b | |
| parent | 66d02a85d91c5981ae3c2ebf5fa5b1e51c7ad143 (diff) | |
Limit the substitution of ' in env vars
Only ' located and the beginning or at the end of the string are
removed. It completes the first proposal [1].
[1] https://gerrit.opnfv.org/gerrit/#/c/28563/
Change-Id: Ic21cea4c6e98d92983f385c875c3e214411b5f2d
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
| -rw-r--r-- | functest/tests/unit/utils/test_openstack_utils.py | 3 | ||||
| -rwxr-xr-x | functest/utils/openstack_utils.py | 10 |
2 files changed, 9 insertions, 4 deletions
diff --git a/functest/tests/unit/utils/test_openstack_utils.py b/functest/tests/unit/utils/test_openstack_utils.py index 0971b4e82..447271fc6 100644 --- a/functest/tests/unit/utils/test_openstack_utils.py +++ b/functest/tests/unit/utils/test_openstack_utils.py @@ -379,6 +379,9 @@ class OSUtilsTesting(unittest.TestCase): self._test_source_credentials('export OS_TENANT_NAME = "admin"') self._test_source_credentials('OS_TENANT_NAME', value='') self._test_source_credentials('export OS_TENANT_NAME', value='') + # This test will fail as soon as rc_file is fixed + self._test_source_credentials( + 'export "\'OS_TENANT_NAME\'" = "\'admin\'"') @mock.patch('functest.utils.openstack_utils.os.getenv', return_value=None) diff --git a/functest/utils/openstack_utils.py b/functest/utils/openstack_utils.py index c21ed818e..3093cb558 100755 --- a/functest/utils/openstack_utils.py +++ b/functest/utils/openstack_utils.py @@ -114,10 +114,12 @@ def get_credentials(other_creds={}): def source_credentials(rc_file): with open(rc_file, "r") as f: for line in f: - var = line.rstrip('"\n').replace( - 'export ', '').replace("'", "").split("=") - key = re.sub(r'^ *| *$', '', var[0]) - value = re.sub(r'^[" ]*|[ "]*$', '', "".join(var[1:])) + var = line.rstrip('"\n').replace('export ', '').split("=") + # The two next lines should be modified as soon as rc_file + # conforms with common rules. Be aware that it could induce + # issues if value starts with ' + key = re.sub(r'^["\' ]*|[ \'"]*$', '', var[0]) + value = re.sub(r'^["\' ]*|[ \'"]*$', '', "".join(var[1:])) os.environ[key] = value |