cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

ansible-test sanity: fix UnicodeDecodeError for --python 2.7 --docker (#72623)

Browse source 
* Store target paths as unicode.

* Add changelog fragment.
This commit is contained in:
Felix Fontein 2020-12-04 18:12:14 +01:00 committed by GitHub
parent 221c50b57c
commit f94ba68d8f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelogs/fragments/72623-ansible-test-unicode-paths.yml Normal file
View file

@ -0,0 +1,2 @@
bugfixes:
- "ansible-test - convert target paths to unicode on Python 2 to avoid ``UnicodeDecodeError`` (https://github.com/ansible/ansible/issues/68398, https://github.com/ansible/ansible/pull/72623)."

7
test/lib/ansible_test/_internal/target.py
View file

@ -12,6 +12,7 @@ from . import types as t
from .encoding import ( from .encoding import (
to_bytes, to_bytes,
to_text,
) )
from .io import ( from .io import (
@ -150,7 +151,7 @@ def filter_targets(targets, # type: t.Iterable[TCompletionTarget]
continue continue
if directories and matched_directories: if directories and matched_directories:
yield DirectoryTarget(sorted(matched_directories, key=len)[0], target.modules) yield DirectoryTarget(to_text(sorted(matched_directories, key=len)[0]), target.modules)
else: else:
yield target yield target
@ -284,7 +285,7 @@ def walk_integration_targets():
paths.append(os.path.sep.join(path_tuple)) paths.append(os.path.sep.join(path_tuple))
for path in paths: for path in paths:
yield IntegrationTarget(path, modules, prefixes) yield IntegrationTarget(to_text(path), modules, prefixes)
def load_integration_prefixes(): def load_integration_prefixes():
@ -332,7 +333,7 @@ def walk_test_targets(path=None, module_path=None, extensions=None, prefix=None,
if symlink and not include_symlinks: if symlink and not include_symlinks:
continue continue
yield TestTarget(file_path, module_path, prefix, path, symlink) yield TestTarget(to_text(file_path), module_path, prefix, path, symlink)
file_paths = [] file_paths = []