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.
This commit is contained in:
parent
923e21836b
commit
d651bda123
225 changed files with 361 additions and 351 deletions
.github
MANIFEST.inbin
docs/docsite/rst/dev_guide
hacking
test
integration/targets
lookup_hashi_vault
setup_remote_constraints
lib/ansible_test
__init__.py
_data
completion
env
injector
ansibleansible-configansible-connectionansible-consoleansible-docansible-galaxyansible-inventoryansible-playbookansible-pullansible-vaultimporter.pypytestpython.pyvirtualenv-isolated.shvirtualenv.sh
pytest.inipytest/plugins
requirements
ansible-test.txtconstraints.txtcoverage.txtintegration.cloud.aws.txtintegration.cloud.azure.txtintegration.cloud.cs.txtintegration.cloud.hcloud.txtintegration.cloud.nios.txtintegration.cloud.opennebula.txtintegration.cloud.openshift.txtintegration.cloud.vcenter.txtintegration.txtnetwork-integration.txtsanity.ps1sanity.txtunits.txtwindows-integration.txt
sanity
ansible.cfg
code-smell
action-plugin-docs.jsonaction-plugin-docs.pyansible-only.txtazure-requirements.jsonazure-requirements.pybotmeta.jsonbotmeta.pychangelog.jsonchangelog.pyconfigure-remoting-ps1.jsonconfigure-remoting-ps1.pydeprecated-config.jsondeprecated-config.pydocs-build.jsondocs-build.pyempty-init.jsonempty-init.pyfuture-import-boilerplate.jsonfuture-import-boilerplate.pyline-endings.jsonline-endings.pymetaclass-boilerplate.jsonmetaclass-boilerplate.pyno-assert.jsonno-assert.pyno-basestring.jsonno-basestring.pyno-dict-iteritems.jsonno-dict-iteritems.pyno-dict-iterkeys.jsonno-dict-iterkeys.pyno-dict-itervalues.jsonno-dict-itervalues.pyno-get-exception.jsonno-get-exception.pyno-illegal-filenames.jsonno-illegal-filenames.pyno-main-display.jsonno-main-display.pyno-smart-quotes.jsonno-smart-quotes.pyno-unicode-literals.jsonno-unicode-literals.pyno-unwanted-files.jsonno-unwanted-files.pypackage-data.jsonpackage-data.pyreplace-urlopen.json
10
.github/BOTMETA.yml
vendored
10
.github/BOTMETA.yml
vendored
|
@ -1464,16 +1464,16 @@ files:
|
|||
docs/docsite/rst/user_guide/windows: *windows_core
|
||||
###############################
|
||||
# 'test' is a component path, then 'test' label will be automatically added
|
||||
test/sanity/validate-modules:
|
||||
test/lib/ansible_test/_data/sanity/validate-modules:
|
||||
notified:
|
||||
- mattclay
|
||||
keywords:
|
||||
- validate-modules
|
||||
test/sanity/validate-modules/schema.py:
|
||||
test/lib/ansible_test/_data/sanity/validate-modules/schema.py:
|
||||
notified:
|
||||
- gundalow
|
||||
- sivel
|
||||
test/sanity/validate-modules/main.py:
|
||||
test/lib/ansible_test/_data/sanity/validate-modules/main.py:
|
||||
notified:
|
||||
- gundalow
|
||||
- sivel
|
||||
|
@ -1520,9 +1520,9 @@ files:
|
|||
test/integration/targets/vultr: *vultr
|
||||
test/legacy/:
|
||||
notified: mattclay
|
||||
test/runner/:
|
||||
test/lib/:
|
||||
notified: mattclay
|
||||
test/runner/lib/cloud/acme.py: *crypto
|
||||
test/lib/ansible_test/_internal/cloud/acme.py: *crypto
|
||||
test/sanity/:
|
||||
notified: mattclay
|
||||
test/units/module_utils/docker/:
|
||||
|
|
|
@ -23,6 +23,6 @@ include MANIFEST.in
|
|||
include changelogs/CHANGELOG*.rst
|
||||
include contrib/README.md
|
||||
recursive-include contrib/inventory *
|
||||
exclude test/sanity/code-smell/botmeta.*
|
||||
exclude test/lib/ansible_test/_data/sanity/code-smell/botmeta.*
|
||||
recursive-include hacking/build_library *.py
|
||||
include hacking/build-ansible.py
|
||||
|
|
|
@ -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()
|
||||
|
|
|
@ -15,7 +15,7 @@ This test can error in the following ways:
|
|||
added, this error should go away.
|
||||
|
||||
* A file has a _BUNDLED_METADATA variable but the file isn't specified in
|
||||
:file:`test/sanity/code-smell/update-bundled.py`. This typically happens when a new bundled
|
||||
:file:`test/lib/ansible_test/_data/sanity/code-smell/update-bundled.py`. This typically happens when a new bundled
|
||||
library is added. Add the file to the `get_bundled_libs()` function in the `update-bundled.py`
|
||||
test script to solve this error.
|
||||
|
||||
|
|
|
@ -52,7 +52,7 @@ Help
|
|||
Extending validate-modules
|
||||
==========================
|
||||
|
||||
The ``validate-modules`` tool has a `schema.py <https://github.com/ansible/ansible/blob/devel/test/sanity/validate-modules/schema.py>`_ that is used to validate the YAML blocks, such as ``DOCUMENTATION`` and ``RETURNS``.
|
||||
The ``validate-modules`` tool has a `schema.py <https://github.com/ansible/ansible/blob/devel/test/lib/ansible_test/_data/sanity/validate-modules/schema.py>`_ that is used to validate the YAML blocks, such as ``DOCUMENTATION`` and ``RETURNS``.
|
||||
|
||||
|
||||
Codes
|
||||
|
|
|
@ -13,7 +13,7 @@ import sys
|
|||
DATABASE_PATH = os.path.expanduser('~/.ansible/report.db')
|
||||
BASE_PATH = os.path.abspath(os.path.join(os.path.dirname(os.path.abspath(__file__)), '..')) + '/'
|
||||
ANSIBLE_PATH = os.path.join(BASE_PATH, 'lib')
|
||||
ANSIBLE_TEST_PATH = os.path.join(BASE_PATH, 'test/runner')
|
||||
ANSIBLE_TEST_PATH = os.path.join(BASE_PATH, 'test/lib')
|
||||
|
||||
if ANSIBLE_PATH not in sys.path:
|
||||
sys.path.insert(0, ANSIBLE_PATH)
|
||||
|
@ -24,7 +24,7 @@ if ANSIBLE_TEST_PATH not in sys.path:
|
|||
from ansible.module_utils.urls import open_url
|
||||
from ansible.parsing.metadata import extract_metadata
|
||||
|
||||
from lib.target import walk_integration_targets
|
||||
from ansible_test._internal.target import walk_integration_targets
|
||||
|
||||
|
||||
def main():
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
shippable/posix/group2
|
||||
destructive
|
||||
needs/target/setup_openssl
|
||||
needs/file/test/runner/requirements/constraints.txt
|
||||
needs/file/test/lib/ansible_test/_data/requirements/constraints.txt
|
||||
|
|
|
@ -17,4 +17,4 @@
|
|||
- name: 'Install hvac Python package'
|
||||
pip:
|
||||
name: "{{ hvac_package|default('hvac') }}"
|
||||
extra_args: "-c {{ playbook_dir }}/../../../../runner/requirements/constraints.txt"
|
||||
extra_args: "-c {{ playbook_dir }}/../../../../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
|
||||
|
|
|
@ -4,5 +4,5 @@
|
|||
|
||||
- name: copy constraints.txt to remote host
|
||||
copy:
|
||||
src: "{{ role_path }}/../../../runner/requirements/constraints.txt"
|
||||
src: "{{ role_path }}/../../../lib/ansible_test/_data/requirements/constraints.txt"
|
||||
dest: "{{ remote_constraints }}"
|
||||
|
|
|
@ -9,7 +9,7 @@ import os
|
|||
|
||||
def main():
|
||||
src = 'packaging/requirements/requirements-azure.txt'
|
||||
dst = 'test/runner/requirements/integration.cloud.azure.txt'
|
||||
dst = 'test/lib/ansible_test/_data/requirements/integration.cloud.azure.txt'
|
||||
|
||||
missing = [p for p in [src, dst] if not os.path.isfile(p)]
|
||||
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Reference in a new issue