diff options
| author | Matt Clay <mclay@redhat.com> | 2021-08-13 00:07:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-13 00:07:06 +0200 |
| commit | 99a79e1969472ab4ba5c0bd0cab61927b9aa93d9 (patch) | |
| tree | eff0efdf8d721c836a4081191039d2dfcfde68fd /test/lib/ansible_test/_internal/executor.py | |
| parent | remove core docs build warnings (#75496) (diff) | |
| download | ansible-99a79e1969472ab4ba5c0bd0cab61927b9aa93d9.tar.xz ansible-99a79e1969472ab4ba5c0bd0cab61927b9aa93d9.zip | |
ansible-test - Move code from _data to _util. (#75495)
* Update paths to match relocated files.
* Update ansible-test symlink paths.
* Update path classification.
* Update MANIFEST.in
* Update sanity test context paths.
* Update sanity ignores.
* Update shebang sanity test.
* Update configure-remoting-ps1 sanity test.
* Update BOTMETA.yml to reflect new paths.
* Update paths in collection loader comments.
* Update Makefile for ansible-test.
* Update docs.
* Add changelog fragment.
Diffstat (limited to 'test/lib/ansible_test/_internal/executor.py')
| -rw-r--r-- | test/lib/ansible_test/_internal/executor.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/test/lib/ansible_test/_internal/executor.py b/test/lib/ansible_test/_internal/executor.py index aeebc9749f..245589327f 100644 --- a/test/lib/ansible_test/_internal/executor.py +++ b/test/lib/ansible_test/_internal/executor.py @@ -26,6 +26,7 @@ from .util import ( find_python, cmd_quote, ANSIBLE_TEST_DATA_ROOT, + ANSIBLE_TEST_TOOLS_ROOT, str_to_version, version_to_str, ) @@ -99,7 +100,7 @@ def get_openssl_version(args, python, python_version): # type: (EnvironmentConf if not python_version.startswith('2.'): # OpenSSL version checking only works on Python 3.x. # This should be the most accurate, since it is the Python we will be using. - version = json.loads(run_command(args, [python, os.path.join(ANSIBLE_TEST_DATA_ROOT, 'sslcheck.py')], capture=True, always=True)[0])['version'] + version = json.loads(run_command(args, [python, os.path.join(ANSIBLE_TEST_TOOLS_ROOT, 'sslcheck.py')], capture=True, always=True)[0])['version'] if version: display.info('Detected OpenSSL version %s under Python %s.' % (version_to_str(version), python_version), verbosity=1) |