diff options
| author | Matt Clay <matt@mystile.com> | 2019-08-06 23:43:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-06 23:43:29 +0200 |
| commit | d651bda12390e46c85c4487859f030ed8851867a (patch) | |
| tree | 4dbe51c6df169557e342938f6fe3f3632d2dc4a8 /bin | |
| parent | Move plugin loader playbook dir additions back to Playbook instead of Playboo... (diff) | |
| download | ansible-d651bda12390e46c85c4487859f030ed8851867a.tar.xz ansible-d651bda12390e46c85c4487859f030ed8851867a.zip | |
Relocate ansible-test code. (#60147)
* Initial move of `test/runner/` content.
`test/runner/lib/` -> `test/lib/ansible_test/_internal/`
`test/runner/` -> `test/lib/ansible_test/_internal/data/`
* Initial move of `test/sanity/` content.
`test/sanity/` -> `test/lib/ansible_test/_internal/data/sanity/` (except `test/sanity/ignore.txt`)
* Initial move of `test/units/pytest/` content.
`test/units/pytest/` -> `test/lib/ansible_test/_internal/data/pytest/`
* Follow-up move of `test/runner/unit/` content.
`test/lib/ansible_test/_internal/data/unit/` -> `test/lib/ansible_test/tests/unit/`
* Initial move of `ansible.cfg` content.
`test/units/ansible.cfg` -> `test/lib/ansible_test/_internal/data/units/ansible.cfg`
`test/env/ansible.cfg` -> `test/lib/ansible_test/_internal/data/env/ansible.cfg`
* Follow-up move of `data` directory.
`test/lib/ansible_test/_internal/data/` -> `test/lib/ansible_test/_data/`
* Update import statements.
* Add missing __init__.py for unit tests.
* Fix path references and miscellaneous issues.
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/ansible-test | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/bin/ansible-test b/bin/ansible-test index aa1c3da47b..c7ea914c69 100755 --- a/bin/ansible-test +++ b/bin/ansible-test @@ -1,15 +1,21 @@ #!/usr/bin/env python # PYTHON_ARGCOMPLETE_OK -"""Primary entry point for ansible-test.""" +"""Command line entry point for ansible-test.""" from __future__ import (absolute_import, division, print_function) - __metaclass__ = type import os import sys if __name__ == '__main__': - sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(os.path.dirname(__file__)), 'test', 'runner'))) - import lib.cli - lib.cli.main() + ansible_root = os.path.abspath(os.path.join(os.path.dirname(os.path.dirname(__file__)))) + source_root = os.path.join(ansible_root, 'test', 'lib') + + if os.path.exists(os.path.join(ansible_root, 'setup.py')) and os.path.exists(os.path.join(source_root, 'ansible_test', '_internal', 'cli.py')): + # running from source, use that version of ansible-test instead of any version that may already be installed + sys.path.insert(0, source_root) + + from ansible_test._internal.cli import main + + main() |