mirror of https://github.com/ansible/ansible.git
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.pull/60169/head
parent
923e21836b
commit
d651bda123
@ -1,15 +1,21 @@
|
|||||||
#!/usr/bin/env python
|
#!/usr/bin/env python
|
||||||
# PYTHON_ARGCOMPLETE_OK
|
# PYTHON_ARGCOMPLETE_OK
|
||||||
"""Primary entry point for ansible-test."""
|
"""Command line entry point for ansible-test."""
|
||||||
|
|
||||||
from __future__ import (absolute_import, division, print_function)
|
from __future__ import (absolute_import, division, print_function)
|
||||||
|
|
||||||
__metaclass__ = type
|
__metaclass__ = type
|
||||||
|
|
||||||
import os
|
import os
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(os.path.dirname(__file__)), 'test', 'runner')))
|
ansible_root = os.path.abspath(os.path.join(os.path.dirname(os.path.dirname(__file__))))
|
||||||
import lib.cli
|
source_root = os.path.join(ansible_root, 'test', 'lib')
|
||||||
lib.cli.main()
|
|
||||||
|
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()
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
shippable/posix/group2
|
shippable/posix/group2
|
||||||
destructive
|
destructive
|
||||||
needs/target/setup_openssl
|
needs/target/setup_openssl
|
||||||
needs/file/test/runner/requirements/constraints.txt
|
needs/file/test/lib/ansible_test/_data/requirements/constraints.txt
|
||||||
|
@ -1 +1 @@
|
|||||||
needs/file/test/runner/requirements/constraints.txt
|
needs/file/test/lib/ansible_test/_data/requirements/constraints.txt
|
||||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue