diff options
| author | Matt Clay <mclay@redhat.com> | 2022-01-28 13:48:34 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-28 13:48:34 -0800 |
| commit | d19b506ce8c5ee43865b1cead2246fc07cc8902b (patch) | |
| tree | 2cda171eea9e1e7eb7f7cd60ad6db00e54b2a147 /test/lib/ansible_test/_internal/util_common.py | |
| parent | 3816815db0cd502f18ca5dd103353dece0cbc6a4 (diff) | |
| download | ansible-d19b506ce8c5ee43865b1cead2246fc07cc8902b.tar.gz | |
ansible-test - Clean up future boilerplate. (#76874)
* ansible-test - Clarify need for empty __init__.py
* ansible-test - Update code-smell boilerplate.
* Update code-smell boilerplate for core.
* Update future boilerplate test for ansible-test.
All ansible-test code (except for targets) and core-specific sanity tests now use the same boilerplate.
The test also checks for unwanted `__future__` and `metaclass` boilerplate.
* Relocate target tools to the correct directory.
Several tools used on target Python versions were incorrectly placed in the controller directory.
Diffstat (limited to 'test/lib/ansible_test/_internal/util_common.py')
| -rw-r--r-- | test/lib/ansible_test/_internal/util_common.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/lib/ansible_test/_internal/util_common.py b/test/lib/ansible_test/_internal/util_common.py index b4d42420b9..0aa05450f5 100644 --- a/test/lib/ansible_test/_internal/util_common.py +++ b/test/lib/ansible_test/_internal/util_common.py @@ -31,7 +31,7 @@ from .util import ( raw_command, ANSIBLE_TEST_DATA_ROOT, ANSIBLE_TEST_TARGET_ROOT, - ANSIBLE_TEST_TOOLS_ROOT, + ANSIBLE_TEST_TARGET_TOOLS_ROOT, ApplicationError, SubprocessError, generate_name, @@ -425,7 +425,7 @@ def run_command( def yamlcheck(python): """Return True if PyYAML has libyaml support, False if it does not and None if it was not found.""" - result = json.loads(raw_command([python.path, os.path.join(ANSIBLE_TEST_TOOLS_ROOT, 'yamlcheck.py')], capture=True)[0]) + result = json.loads(raw_command([python.path, os.path.join(ANSIBLE_TEST_TARGET_TOOLS_ROOT, 'yamlcheck.py')], capture=True)[0]) if not result['yaml']: return None |