internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-04-14 12:51:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix encoding issues with file paths. (#50830)

Browse Source 
* Fix encoding issues with file paths.

Discovered while testing with ANSIBLE_CONFIG env var set to a path
that contained unicode characters while LC_ALL=C.

* Fix unit tests.

* Fix another path encoding issue.
This commit is contained in:
Matt Clay
2019-01-14 13:06:47 -08:00
committed by GitHub
parent 15b1a31aa8
commit 465df0ef8d
5 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/units/config/manager/test_find_ini_config_file.py
View File

@@ -13,7 +13,7 @@ import stat
import pytest
from ansible.config.manager import find_ini_config_file
from ansible.module_utils._text import to_text
real_exists = os.path.exists
real_isdir = os.path.isdir
@@ -48,7 +48,7 @@ def setup_env(request):
@pytest.fixture
def setup_existing_files(request, monkeypatch):
def _os_path_exists(path):
if path in (request.param[0]):
if to_text(path) in (request.param[0]):
return True
else:
return False
@@ -56,7 +56,7 @@ def setup_existing_files(request, monkeypatch):
# Enable user and system dirs so that we know cwd takes precedence
monkeypatch.setattr("os.path.exists", _os_path_exists)
monkeypatch.setattr("os.getcwd", lambda: os.path.dirname(cfg_dir))
monkeypatch.setattr("os.path.isdir", lambda path: True if path == cfg_dir else real_isdir(path))
monkeypatch.setattr("os.path.isdir", lambda path: True if to_text(path) == cfg_dir else real_isdir(path))
class TestFindIniFile: