ansible/test/runner/lib/delegation.py

508 lines
15 KiB
Python
Raw Normal View History

"""Delegate test execution to another environment."""
from __future__ import absolute_import, print_function
import os
import re
import sys
import tempfile
import lib.pytar
import lib.thread
from lib.executor import (
SUPPORTED_PYTHON_VERSIONS,
HTTPTESTER_HOSTS,
create_shell_command,
run_httptester,
start_httptester,
)
from lib.config import (
TestConfig,
EnvironmentConfig,
IntegrationConfig,
ShellConfig,
SanityConfig,
UnitsConfig,
)
from lib.core_ci import (
AnsibleCoreCI,
)
from lib.manage_ci import (
ManagePosixCI,
Backport test infra fixes and updates to stable-2.5. (#46992) * Fix unit test parametrize order on Python 3.5. (cherry picked from commit 53b230ca746e8657d6aed09885568f0cf8dbc61e) * Fix ansible-test unit test execution. (#45772) * Fix ansible-test units requirements install. * Run unit tests as unprivileged user under Docker. (cherry picked from commit 379a7f4f5a0491964c7896834f3f326412888585) * Run unit tests in parallel. (#45812) (cherry picked from commit abe8e4c9e8bd9cdca70a7906b15beb57a52393ca) * Minor fixes for unit test delegation. (cherry picked from commit be199cfe90927d4e369597ee3c4b86401454614c) * add support for opening shell on remote Windows host (#43919) * add support for opening shell on remote Windows host * added arg completion and fix sanity check * remove uneeded arg (cherry picked from commit 6ca4ea0c1f20ff23f231bbe14a80fd3eafc87087) * Block network access for unit tests in docker. (cherry picked from commit 99cac99cbc3b49ad9fb39950d881e0f266775320) * Make ansible-test available in the bin directory. (#45876) (cherry picked from commit f3d1f9544ba67785e787ea303f81db74603780eb) * Support comments in ansible-test flat files. (cherry picked from commit 5a3000af19b81c1baf592e970683c7fd0ac0d43f) * Fix incorrect use of subprocess.CalledProcessError (#45890) (cherry picked from commit 24dd87bd0abeb41a8cf167f7f31ed7e8e4255ea3) * Improve ansible-test match error handling. (cherry picked from commit 2056c981ae0fad9289337cb63c8b1b0d5b539368) * Improve error handling for docs-build test. (cherry picked from commit 2148999048179c623a31b0fac3bb02361ec42fe2) * Bug fixes and cleanup for ansible-test. (#45991) * Remove unused imports. * Clean up ConfigParser usage in ansible-test. * Fix bare except statements in ansible-test. * Miscellaneous cleanup from PyCharm inspections. * Enable pylint no-self-use for ansible-test. * Remove obsolete pylint ignores for Python 3.7. * Fix shellcheck issuers under newer shellcheck. * Use newer path for ansible-test. * Fix issues in code-smell tests. (cherry picked from commit ac492476e5389e17b8d401174f18b73e59a7fb06) * Fix integration test library search path. This prevents tests from loading modules outside the source tree, which could result in testing the wrong module if a system-wide install is present, or custom modules exist. (cherry picked from commit d603cd41feaef3d9beaa7f133ded59d6809b4916) * Update default container to version 1.2.0. (cherry picked from commit d478a4c3f6e02b48507070c3d1d63fd158890756) (cherry picked from commit 21c4eb8db50423a8184ded3b04fd81d737a4e0fb) * Fix ansible-test docker python version handling. This removes the old name based version detection behavior and uses versions defined in the docker completion file instead, as the new containers do not follow the old naming scheme. (cherry picked from commit 54937ba7848c3d10b31b85c46e3e8d41c98c5519) * Reduce noise in docs-build test failures. (cherry picked from commit 4085d016178fe4be15a52264fe903fd2932cefc7) * Fix ansible-test encoding issues for exceptions. (cherry picked from commit 0d7a156319f2b9f1786147bb717ec2b0d7bd6091) * Fix ansible-test multi-group smoke test handling. (#46363) * Fix ansible-test smoke tests across groups. * Fix ansible-test list arg defaults. * Fix ansible-test require and exclude delegation. * Fix detection of Windows specific changes. * Add minimal Windows testing for Python 3.7. (cherry picked from commit e53390b3b1afedc475294f25b9c2b847fa63a806) * Use default-test-container version 1.3.0. (cherry picked from commit 6d9be66418452a655b551e0796361273f3c7ac18) * Add file exists check in integration-aliases test. (cherry picked from commit 33a8be9109ff3bf77d21dfa0117238d0f081a0b1) * Improve ansible-test environment checking between tests. (#46459) * Add unified diff output to environment validation. This makes it easier to see where the environment changed. * Compare Python interpreters by version to pip shebangs. This helps expose cases where pip executables use a different Python interpreter than is expected. * Query `pip.__version__` instead of using `pip --version`. This is a much faster way to query the pip version. It also more closely matches how we invoke pip within ansible-test. * Remove redundant environment scan between tests. This reuses the environment scan from the end of the previous test as the basis for comparison during the next test. (cherry picked from commit 0dc7f3878794f6deecfcc642da45c951ca376069) * Add symlinks sanity test. (#46467) * Add symlinks sanity test. * Replace legacy test symlinks with actual content. * Remove dir symlink from template_jinja2_latest. * Update import test to use generated library dir. * Fix copy test symlink setup. (cherry picked from commit e2b60475147204ff5c06de3b4f0e2106ded064ff) * Fix parametrize warning in unit tests. (cherry picked from commit 1a28898a008b7c349bbd7a7604788678bc954e31) * Update MANIFEST.in (#46502) * Update MANIFEST.in: - Remove unnecessary prune. - Include files needed by tests. - Exclude botmeta sanity test. These changes permit sanity tests to pass on sdist output. (cherry picked from commit cbb49f66ecbba1547fe864cb2ff08ddbe0ad074c) * Fix unit tests which modify the source tree. (#45763) * Fix CNOS unit test log usage. * Use temp dir for Galaxy unit tests. * Write to temp files in interfaces_file unit test. * Fix log placement in netapp_e_ldap unit test. (cherry picked from commit 0686450cae86720c804d2f6b6d09fa3abba9dacc) * Fix ansible-test custom docker image traceback. (cherry picked from commit 712ad9ed64084b58058801258087667a6681939d) * ansible-test: Create public key creating Windows targets (#43760) * ansible-test: Create public key creating Windows targets * Changed to always set SSH Key for Windows hosts (cherry picked from commit adc0efe10c5be833b5138e1d8b0d0316f87c5241) * Fix and re-enable sts_assume_role integration tests (#46026) * Fix the STS assume role error message assertion when the role to assume does not exist. (cherry picked from commit 18dc928e28ae35bf9b786c8a48558ff83cc3a6a2) * Fix ACI unit test on Python 3.7.0. The previous logic was only needed for pre-release versions of 3.7. (cherry picked from commit c0bf9815c98c9ec00fc9648ae7a0f561684fc10e) * Remove placeboify from unit tests that are not calling AWS (i.e. creating a recording) (#45754) (cherry picked from commit 2167ce6cb6db57bf066dce83a5a03978a13bf1ef) * Update sanity test ignore entries.
2018-10-13 17:44:11 +00:00
ManageWindowsCI,
)
from lib.util import (
ApplicationError,
run_command,
common_environment,
pass_vars,
display,
)
from lib.docker_util import (
docker_exec,
docker_get,
docker_pull,
docker_put,
docker_rm,
docker_run,
docker_available,
Backport test infra fixes and updates to stable-2.5. (#46992) * Fix unit test parametrize order on Python 3.5. (cherry picked from commit 53b230ca746e8657d6aed09885568f0cf8dbc61e) * Fix ansible-test unit test execution. (#45772) * Fix ansible-test units requirements install. * Run unit tests as unprivileged user under Docker. (cherry picked from commit 379a7f4f5a0491964c7896834f3f326412888585) * Run unit tests in parallel. (#45812) (cherry picked from commit abe8e4c9e8bd9cdca70a7906b15beb57a52393ca) * Minor fixes for unit test delegation. (cherry picked from commit be199cfe90927d4e369597ee3c4b86401454614c) * add support for opening shell on remote Windows host (#43919) * add support for opening shell on remote Windows host * added arg completion and fix sanity check * remove uneeded arg (cherry picked from commit 6ca4ea0c1f20ff23f231bbe14a80fd3eafc87087) * Block network access for unit tests in docker. (cherry picked from commit 99cac99cbc3b49ad9fb39950d881e0f266775320) * Make ansible-test available in the bin directory. (#45876) (cherry picked from commit f3d1f9544ba67785e787ea303f81db74603780eb) * Support comments in ansible-test flat files. (cherry picked from commit 5a3000af19b81c1baf592e970683c7fd0ac0d43f) * Fix incorrect use of subprocess.CalledProcessError (#45890) (cherry picked from commit 24dd87bd0abeb41a8cf167f7f31ed7e8e4255ea3) * Improve ansible-test match error handling. (cherry picked from commit 2056c981ae0fad9289337cb63c8b1b0d5b539368) * Improve error handling for docs-build test. (cherry picked from commit 2148999048179c623a31b0fac3bb02361ec42fe2) * Bug fixes and cleanup for ansible-test. (#45991) * Remove unused imports. * Clean up ConfigParser usage in ansible-test. * Fix bare except statements in ansible-test. * Miscellaneous cleanup from PyCharm inspections. * Enable pylint no-self-use for ansible-test. * Remove obsolete pylint ignores for Python 3.7. * Fix shellcheck issuers under newer shellcheck. * Use newer path for ansible-test. * Fix issues in code-smell tests. (cherry picked from commit ac492476e5389e17b8d401174f18b73e59a7fb06) * Fix integration test library search path. This prevents tests from loading modules outside the source tree, which could result in testing the wrong module if a system-wide install is present, or custom modules exist. (cherry picked from commit d603cd41feaef3d9beaa7f133ded59d6809b4916) * Update default container to version 1.2.0. (cherry picked from commit d478a4c3f6e02b48507070c3d1d63fd158890756) (cherry picked from commit 21c4eb8db50423a8184ded3b04fd81d737a4e0fb) * Fix ansible-test docker python version handling. This removes the old name based version detection behavior and uses versions defined in the docker completion file instead, as the new containers do not follow the old naming scheme. (cherry picked from commit 54937ba7848c3d10b31b85c46e3e8d41c98c5519) * Reduce noise in docs-build test failures. (cherry picked from commit 4085d016178fe4be15a52264fe903fd2932cefc7) * Fix ansible-test encoding issues for exceptions. (cherry picked from commit 0d7a156319f2b9f1786147bb717ec2b0d7bd6091) * Fix ansible-test multi-group smoke test handling. (#46363) * Fix ansible-test smoke tests across groups. * Fix ansible-test list arg defaults. * Fix ansible-test require and exclude delegation. * Fix detection of Windows specific changes. * Add minimal Windows testing for Python 3.7. (cherry picked from commit e53390b3b1afedc475294f25b9c2b847fa63a806) * Use default-test-container version 1.3.0. (cherry picked from commit 6d9be66418452a655b551e0796361273f3c7ac18) * Add file exists check in integration-aliases test. (cherry picked from commit 33a8be9109ff3bf77d21dfa0117238d0f081a0b1) * Improve ansible-test environment checking between tests. (#46459) * Add unified diff output to environment validation. This makes it easier to see where the environment changed. * Compare Python interpreters by version to pip shebangs. This helps expose cases where pip executables use a different Python interpreter than is expected. * Query `pip.__version__` instead of using `pip --version`. This is a much faster way to query the pip version. It also more closely matches how we invoke pip within ansible-test. * Remove redundant environment scan between tests. This reuses the environment scan from the end of the previous test as the basis for comparison during the next test. (cherry picked from commit 0dc7f3878794f6deecfcc642da45c951ca376069) * Add symlinks sanity test. (#46467) * Add symlinks sanity test. * Replace legacy test symlinks with actual content. * Remove dir symlink from template_jinja2_latest. * Update import test to use generated library dir. * Fix copy test symlink setup. (cherry picked from commit e2b60475147204ff5c06de3b4f0e2106ded064ff) * Fix parametrize warning in unit tests. (cherry picked from commit 1a28898a008b7c349bbd7a7604788678bc954e31) * Update MANIFEST.in (#46502) * Update MANIFEST.in: - Remove unnecessary prune. - Include files needed by tests. - Exclude botmeta sanity test. These changes permit sanity tests to pass on sdist output. (cherry picked from commit cbb49f66ecbba1547fe864cb2ff08ddbe0ad074c) * Fix unit tests which modify the source tree. (#45763) * Fix CNOS unit test log usage. * Use temp dir for Galaxy unit tests. * Write to temp files in interfaces_file unit test. * Fix log placement in netapp_e_ldap unit test. (cherry picked from commit 0686450cae86720c804d2f6b6d09fa3abba9dacc) * Fix ansible-test custom docker image traceback. (cherry picked from commit 712ad9ed64084b58058801258087667a6681939d) * ansible-test: Create public key creating Windows targets (#43760) * ansible-test: Create public key creating Windows targets * Changed to always set SSH Key for Windows hosts (cherry picked from commit adc0efe10c5be833b5138e1d8b0d0316f87c5241) * Fix and re-enable sts_assume_role integration tests (#46026) * Fix the STS assume role error message assertion when the role to assume does not exist. (cherry picked from commit 18dc928e28ae35bf9b786c8a48558ff83cc3a6a2) * Fix ACI unit test on Python 3.7.0. The previous logic was only needed for pre-release versions of 3.7. (cherry picked from commit c0bf9815c98c9ec00fc9648ae7a0f561684fc10e) * Remove placeboify from unit tests that are not calling AWS (i.e. creating a recording) (#45754) (cherry picked from commit 2167ce6cb6db57bf066dce83a5a03978a13bf1ef) * Update sanity test ignore entries.
2018-10-13 17:44:11 +00:00
docker_network_disconnect,
get_docker_networks,
)
from lib.cloud import (
get_cloud_providers,
)
from lib.target import (
IntegrationTarget,
)
def delegate(args, exclude, require, integration_targets):
"""
:type args: EnvironmentConfig
:type exclude: list[str]
:type require: list[str]
:type integration_targets: tuple[IntegrationTarget]
:rtype: bool
"""
if isinstance(args, TestConfig):
with tempfile.NamedTemporaryFile(prefix='metadata-', suffix='.json', dir=os.getcwd()) as metadata_fd:
args.metadata_path = os.path.basename(metadata_fd.name)
args.metadata.to_file(args.metadata_path)
try:
return delegate_command(args, exclude, require, integration_targets)
finally:
args.metadata_path = None
else:
return delegate_command(args, exclude, require, integration_targets)
def delegate_command(args, exclude, require, integration_targets):
"""
:type args: EnvironmentConfig
:type exclude: list[str]
:type require: list[str]
:type integration_targets: tuple[IntegrationTarget]
:rtype: bool
"""
if args.tox:
delegate_tox(args, exclude, require, integration_targets)
return True
if args.docker:
delegate_docker(args, exclude, require, integration_targets)
return True
if args.remote:
delegate_remote(args, exclude, require, integration_targets)
return True
return False
def delegate_tox(args, exclude, require, integration_targets):
"""
:type args: EnvironmentConfig
:type exclude: list[str]
:type require: list[str]
:type integration_targets: tuple[IntegrationTarget]
"""
if args.python:
versions = args.python_version,
if args.python_version not in SUPPORTED_PYTHON_VERSIONS:
raise ApplicationError('tox does not support Python version %s' % args.python_version)
else:
versions = SUPPORTED_PYTHON_VERSIONS
if args.httptester:
needs_httptester = sorted(target.name for target in integration_targets if 'needs/httptester/' in target.aliases)
if needs_httptester:
display.warning('Use --docker or --remote to enable httptester for tests marked "needs/httptester": %s' % ', '.join(needs_httptester))
options = {
'--tox': args.tox_args,
'--tox-sitepackages': 0,
}
for version in versions:
tox = ['tox', '-c', 'test/runner/tox.ini', '-e', 'py' + version.replace('.', '')]
if args.tox_sitepackages:
tox.append('--sitepackages')
tox.append('--')
Backport test infra fixes and updates to stable-2.5. (#46992) * Fix unit test parametrize order on Python 3.5. (cherry picked from commit 53b230ca746e8657d6aed09885568f0cf8dbc61e) * Fix ansible-test unit test execution. (#45772) * Fix ansible-test units requirements install. * Run unit tests as unprivileged user under Docker. (cherry picked from commit 379a7f4f5a0491964c7896834f3f326412888585) * Run unit tests in parallel. (#45812) (cherry picked from commit abe8e4c9e8bd9cdca70a7906b15beb57a52393ca) * Minor fixes for unit test delegation. (cherry picked from commit be199cfe90927d4e369597ee3c4b86401454614c) * add support for opening shell on remote Windows host (#43919) * add support for opening shell on remote Windows host * added arg completion and fix sanity check * remove uneeded arg (cherry picked from commit 6ca4ea0c1f20ff23f231bbe14a80fd3eafc87087) * Block network access for unit tests in docker. (cherry picked from commit 99cac99cbc3b49ad9fb39950d881e0f266775320) * Make ansible-test available in the bin directory. (#45876) (cherry picked from commit f3d1f9544ba67785e787ea303f81db74603780eb) * Support comments in ansible-test flat files. (cherry picked from commit 5a3000af19b81c1baf592e970683c7fd0ac0d43f) * Fix incorrect use of subprocess.CalledProcessError (#45890) (cherry picked from commit 24dd87bd0abeb41a8cf167f7f31ed7e8e4255ea3) * Improve ansible-test match error handling. (cherry picked from commit 2056c981ae0fad9289337cb63c8b1b0d5b539368) * Improve error handling for docs-build test. (cherry picked from commit 2148999048179c623a31b0fac3bb02361ec42fe2) * Bug fixes and cleanup for ansible-test. (#45991) * Remove unused imports. * Clean up ConfigParser usage in ansible-test. * Fix bare except statements in ansible-test. * Miscellaneous cleanup from PyCharm inspections. * Enable pylint no-self-use for ansible-test. * Remove obsolete pylint ignores for Python 3.7. * Fix shellcheck issuers under newer shellcheck. * Use newer path for ansible-test. * Fix issues in code-smell tests. (cherry picked from commit ac492476e5389e17b8d401174f18b73e59a7fb06) * Fix integration test library search path. This prevents tests from loading modules outside the source tree, which could result in testing the wrong module if a system-wide install is present, or custom modules exist. (cherry picked from commit d603cd41feaef3d9beaa7f133ded59d6809b4916) * Update default container to version 1.2.0. (cherry picked from commit d478a4c3f6e02b48507070c3d1d63fd158890756) (cherry picked from commit 21c4eb8db50423a8184ded3b04fd81d737a4e0fb) * Fix ansible-test docker python version handling. This removes the old name based version detection behavior and uses versions defined in the docker completion file instead, as the new containers do not follow the old naming scheme. (cherry picked from commit 54937ba7848c3d10b31b85c46e3e8d41c98c5519) * Reduce noise in docs-build test failures. (cherry picked from commit 4085d016178fe4be15a52264fe903fd2932cefc7) * Fix ansible-test encoding issues for exceptions. (cherry picked from commit 0d7a156319f2b9f1786147bb717ec2b0d7bd6091) * Fix ansible-test multi-group smoke test handling. (#46363) * Fix ansible-test smoke tests across groups. * Fix ansible-test list arg defaults. * Fix ansible-test require and exclude delegation. * Fix detection of Windows specific changes. * Add minimal Windows testing for Python 3.7. (cherry picked from commit e53390b3b1afedc475294f25b9c2b847fa63a806) * Use default-test-container version 1.3.0. (cherry picked from commit 6d9be66418452a655b551e0796361273f3c7ac18) * Add file exists check in integration-aliases test. (cherry picked from commit 33a8be9109ff3bf77d21dfa0117238d0f081a0b1) * Improve ansible-test environment checking between tests. (#46459) * Add unified diff output to environment validation. This makes it easier to see where the environment changed. * Compare Python interpreters by version to pip shebangs. This helps expose cases where pip executables use a different Python interpreter than is expected. * Query `pip.__version__` instead of using `pip --version`. This is a much faster way to query the pip version. It also more closely matches how we invoke pip within ansible-test. * Remove redundant environment scan between tests. This reuses the environment scan from the end of the previous test as the basis for comparison during the next test. (cherry picked from commit 0dc7f3878794f6deecfcc642da45c951ca376069) * Add symlinks sanity test. (#46467) * Add symlinks sanity test. * Replace legacy test symlinks with actual content. * Remove dir symlink from template_jinja2_latest. * Update import test to use generated library dir. * Fix copy test symlink setup. (cherry picked from commit e2b60475147204ff5c06de3b4f0e2106ded064ff) * Fix parametrize warning in unit tests. (cherry picked from commit 1a28898a008b7c349bbd7a7604788678bc954e31) * Update MANIFEST.in (#46502) * Update MANIFEST.in: - Remove unnecessary prune. - Include files needed by tests. - Exclude botmeta sanity test. These changes permit sanity tests to pass on sdist output. (cherry picked from commit cbb49f66ecbba1547fe864cb2ff08ddbe0ad074c) * Fix unit tests which modify the source tree. (#45763) * Fix CNOS unit test log usage. * Use temp dir for Galaxy unit tests. * Write to temp files in interfaces_file unit test. * Fix log placement in netapp_e_ldap unit test. (cherry picked from commit 0686450cae86720c804d2f6b6d09fa3abba9dacc) * Fix ansible-test custom docker image traceback. (cherry picked from commit 712ad9ed64084b58058801258087667a6681939d) * ansible-test: Create public key creating Windows targets (#43760) * ansible-test: Create public key creating Windows targets * Changed to always set SSH Key for Windows hosts (cherry picked from commit adc0efe10c5be833b5138e1d8b0d0316f87c5241) * Fix and re-enable sts_assume_role integration tests (#46026) * Fix the STS assume role error message assertion when the role to assume does not exist. (cherry picked from commit 18dc928e28ae35bf9b786c8a48558ff83cc3a6a2) * Fix ACI unit test on Python 3.7.0. The previous logic was only needed for pre-release versions of 3.7. (cherry picked from commit c0bf9815c98c9ec00fc9648ae7a0f561684fc10e) * Remove placeboify from unit tests that are not calling AWS (i.e. creating a recording) (#45754) (cherry picked from commit 2167ce6cb6db57bf066dce83a5a03978a13bf1ef) * Update sanity test ignore entries.
2018-10-13 17:44:11 +00:00
cmd = generate_command(args, os.path.abspath('bin/ansible-test'), options, exclude, require)
if not args.python:
cmd += ['--python', version]
if isinstance(args, TestConfig):
if args.coverage and not args.coverage_label:
cmd += ['--coverage-label', 'tox-%s' % version]
env = common_environment()
# temporary solution to permit ansible-test delegated to tox to provision remote resources
optional = (
'SHIPPABLE',
'SHIPPABLE_BUILD_ID',
'SHIPPABLE_JOB_NUMBER',
)
env.update(pass_vars(required=[], optional=optional))
run_command(args, tox + cmd, env=env)
def delegate_docker(args, exclude, require, integration_targets):
"""
:type args: EnvironmentConfig
:type exclude: list[str]
:type require: list[str]
:type integration_targets: tuple[IntegrationTarget]
"""
test_image = args.docker
privileged = args.docker_privileged
if isinstance(args, ShellConfig):
use_httptester = args.httptester
else:
use_httptester = args.httptester and any('needs/httptester/' in target.aliases for target in integration_targets)
if use_httptester:
docker_pull(args, args.httptester)
docker_pull(args, test_image)
httptester_id = None
test_id = None
options = {
'--docker': 1,
'--docker-privileged': 0,
'--docker-util': 1,
}
Backport test infra fixes and updates to stable-2.5. (#46992) * Fix unit test parametrize order on Python 3.5. (cherry picked from commit 53b230ca746e8657d6aed09885568f0cf8dbc61e) * Fix ansible-test unit test execution. (#45772) * Fix ansible-test units requirements install. * Run unit tests as unprivileged user under Docker. (cherry picked from commit 379a7f4f5a0491964c7896834f3f326412888585) * Run unit tests in parallel. (#45812) (cherry picked from commit abe8e4c9e8bd9cdca70a7906b15beb57a52393ca) * Minor fixes for unit test delegation. (cherry picked from commit be199cfe90927d4e369597ee3c4b86401454614c) * add support for opening shell on remote Windows host (#43919) * add support for opening shell on remote Windows host * added arg completion and fix sanity check * remove uneeded arg (cherry picked from commit 6ca4ea0c1f20ff23f231bbe14a80fd3eafc87087) * Block network access for unit tests in docker. (cherry picked from commit 99cac99cbc3b49ad9fb39950d881e0f266775320) * Make ansible-test available in the bin directory. (#45876) (cherry picked from commit f3d1f9544ba67785e787ea303f81db74603780eb) * Support comments in ansible-test flat files. (cherry picked from commit 5a3000af19b81c1baf592e970683c7fd0ac0d43f) * Fix incorrect use of subprocess.CalledProcessError (#45890) (cherry picked from commit 24dd87bd0abeb41a8cf167f7f31ed7e8e4255ea3) * Improve ansible-test match error handling. (cherry picked from commit 2056c981ae0fad9289337cb63c8b1b0d5b539368) * Improve error handling for docs-build test. (cherry picked from commit 2148999048179c623a31b0fac3bb02361ec42fe2) * Bug fixes and cleanup for ansible-test. (#45991) * Remove unused imports. * Clean up ConfigParser usage in ansible-test. * Fix bare except statements in ansible-test. * Miscellaneous cleanup from PyCharm inspections. * Enable pylint no-self-use for ansible-test. * Remove obsolete pylint ignores for Python 3.7. * Fix shellcheck issuers under newer shellcheck. * Use newer path for ansible-test. * Fix issues in code-smell tests. (cherry picked from commit ac492476e5389e17b8d401174f18b73e59a7fb06) * Fix integration test library search path. This prevents tests from loading modules outside the source tree, which could result in testing the wrong module if a system-wide install is present, or custom modules exist. (cherry picked from commit d603cd41feaef3d9beaa7f133ded59d6809b4916) * Update default container to version 1.2.0. (cherry picked from commit d478a4c3f6e02b48507070c3d1d63fd158890756) (cherry picked from commit 21c4eb8db50423a8184ded3b04fd81d737a4e0fb) * Fix ansible-test docker python version handling. This removes the old name based version detection behavior and uses versions defined in the docker completion file instead, as the new containers do not follow the old naming scheme. (cherry picked from commit 54937ba7848c3d10b31b85c46e3e8d41c98c5519) * Reduce noise in docs-build test failures. (cherry picked from commit 4085d016178fe4be15a52264fe903fd2932cefc7) * Fix ansible-test encoding issues for exceptions. (cherry picked from commit 0d7a156319f2b9f1786147bb717ec2b0d7bd6091) * Fix ansible-test multi-group smoke test handling. (#46363) * Fix ansible-test smoke tests across groups. * Fix ansible-test list arg defaults. * Fix ansible-test require and exclude delegation. * Fix detection of Windows specific changes. * Add minimal Windows testing for Python 3.7. (cherry picked from commit e53390b3b1afedc475294f25b9c2b847fa63a806) * Use default-test-container version 1.3.0. (cherry picked from commit 6d9be66418452a655b551e0796361273f3c7ac18) * Add file exists check in integration-aliases test. (cherry picked from commit 33a8be9109ff3bf77d21dfa0117238d0f081a0b1) * Improve ansible-test environment checking between tests. (#46459) * Add unified diff output to environment validation. This makes it easier to see where the environment changed. * Compare Python interpreters by version to pip shebangs. This helps expose cases where pip executables use a different Python interpreter than is expected. * Query `pip.__version__` instead of using `pip --version`. This is a much faster way to query the pip version. It also more closely matches how we invoke pip within ansible-test. * Remove redundant environment scan between tests. This reuses the environment scan from the end of the previous test as the basis for comparison during the next test. (cherry picked from commit 0dc7f3878794f6deecfcc642da45c951ca376069) * Add symlinks sanity test. (#46467) * Add symlinks sanity test. * Replace legacy test symlinks with actual content. * Remove dir symlink from template_jinja2_latest. * Update import test to use generated library dir. * Fix copy test symlink setup. (cherry picked from commit e2b60475147204ff5c06de3b4f0e2106ded064ff) * Fix parametrize warning in unit tests. (cherry picked from commit 1a28898a008b7c349bbd7a7604788678bc954e31) * Update MANIFEST.in (#46502) * Update MANIFEST.in: - Remove unnecessary prune. - Include files needed by tests. - Exclude botmeta sanity test. These changes permit sanity tests to pass on sdist output. (cherry picked from commit cbb49f66ecbba1547fe864cb2ff08ddbe0ad074c) * Fix unit tests which modify the source tree. (#45763) * Fix CNOS unit test log usage. * Use temp dir for Galaxy unit tests. * Write to temp files in interfaces_file unit test. * Fix log placement in netapp_e_ldap unit test. (cherry picked from commit 0686450cae86720c804d2f6b6d09fa3abba9dacc) * Fix ansible-test custom docker image traceback. (cherry picked from commit 712ad9ed64084b58058801258087667a6681939d) * ansible-test: Create public key creating Windows targets (#43760) * ansible-test: Create public key creating Windows targets * Changed to always set SSH Key for Windows hosts (cherry picked from commit adc0efe10c5be833b5138e1d8b0d0316f87c5241) * Fix and re-enable sts_assume_role integration tests (#46026) * Fix the STS assume role error message assertion when the role to assume does not exist. (cherry picked from commit 18dc928e28ae35bf9b786c8a48558ff83cc3a6a2) * Fix ACI unit test on Python 3.7.0. The previous logic was only needed for pre-release versions of 3.7. (cherry picked from commit c0bf9815c98c9ec00fc9648ae7a0f561684fc10e) * Remove placeboify from unit tests that are not calling AWS (i.e. creating a recording) (#45754) (cherry picked from commit 2167ce6cb6db57bf066dce83a5a03978a13bf1ef) * Update sanity test ignore entries.
2018-10-13 17:44:11 +00:00
cmd = generate_command(args, '/root/ansible/bin/ansible-test', options, exclude, require)
if isinstance(args, TestConfig):
if args.coverage and not args.coverage_label:
image_label = args.docker_raw
image_label = re.sub('[^a-zA-Z0-9]+', '-', image_label)
cmd += ['--coverage-label', 'docker-%s' % image_label]
if isinstance(args, IntegrationConfig):
if not args.allow_destructive:
cmd.append('--allow-destructive')
cmd_options = []
if isinstance(args, ShellConfig) or (isinstance(args, IntegrationConfig) and args.debug_strategy):
cmd_options.append('-it')
with tempfile.NamedTemporaryFile(prefix='ansible-source-', suffix='.tgz') as local_source_fd:
try:
if not args.explain:
if args.docker_keep_git:
tar_filter = lib.pytar.AllowGitTarFilter()
else:
tar_filter = lib.pytar.DefaultTarFilter()
lib.pytar.create_tarfile(local_source_fd.name, '.', tar_filter)
if use_httptester:
httptester_id = run_httptester(args)
else:
httptester_id = None
test_options = [
'--detach',
'--volume', '/sys/fs/cgroup:/sys/fs/cgroup:ro',
'--privileged=%s' % str(privileged).lower(),
]
if args.docker_memory:
test_options.extend([
'--memory=%d' % args.docker_memory,
'--memory-swap=%d' % args.docker_memory,
])
docker_socket = '/var/run/docker.sock'
if args.docker_seccomp != 'default':
test_options += ['--security-opt', 'seccomp=%s' % args.docker_seccomp]
if os.path.exists(docker_socket):
test_options += ['--volume', '%s:%s' % (docker_socket, docker_socket)]
if httptester_id:
test_options += ['--env', 'HTTPTESTER=1']
for host in HTTPTESTER_HOSTS:
test_options += ['--link', '%s:%s' % (httptester_id, host)]
if isinstance(args, IntegrationConfig):
cloud_platforms = get_cloud_providers(args)
for cloud_platform in cloud_platforms:
test_options += cloud_platform.get_docker_run_options()
test_id, _ = docker_run(args, test_image, options=test_options)
if args.explain:
test_id = 'test_id'
else:
test_id = test_id.strip()
# write temporary files to /root since /tmp isn't ready immediately on container start
docker_put(args, test_id, 'test/runner/setup/docker.sh', '/root/docker.sh')
docker_exec(args, test_id, ['/bin/bash', '/root/docker.sh'])
docker_put(args, test_id, local_source_fd.name, '/root/ansible.tgz')
docker_exec(args, test_id, ['mkdir', '/root/ansible'])
docker_exec(args, test_id, ['tar', 'oxzf', '/root/ansible.tgz', '-C', '/root/ansible'])
# docker images are only expected to have a single python version available
if isinstance(args, UnitsConfig) and not args.python:
cmd += ['--python', 'default']
Backport test infra fixes and updates to stable-2.5. (#46992) * Fix unit test parametrize order on Python 3.5. (cherry picked from commit 53b230ca746e8657d6aed09885568f0cf8dbc61e) * Fix ansible-test unit test execution. (#45772) * Fix ansible-test units requirements install. * Run unit tests as unprivileged user under Docker. (cherry picked from commit 379a7f4f5a0491964c7896834f3f326412888585) * Run unit tests in parallel. (#45812) (cherry picked from commit abe8e4c9e8bd9cdca70a7906b15beb57a52393ca) * Minor fixes for unit test delegation. (cherry picked from commit be199cfe90927d4e369597ee3c4b86401454614c) * add support for opening shell on remote Windows host (#43919) * add support for opening shell on remote Windows host * added arg completion and fix sanity check * remove uneeded arg (cherry picked from commit 6ca4ea0c1f20ff23f231bbe14a80fd3eafc87087) * Block network access for unit tests in docker. (cherry picked from commit 99cac99cbc3b49ad9fb39950d881e0f266775320) * Make ansible-test available in the bin directory. (#45876) (cherry picked from commit f3d1f9544ba67785e787ea303f81db74603780eb) * Support comments in ansible-test flat files. (cherry picked from commit 5a3000af19b81c1baf592e970683c7fd0ac0d43f) * Fix incorrect use of subprocess.CalledProcessError (#45890) (cherry picked from commit 24dd87bd0abeb41a8cf167f7f31ed7e8e4255ea3) * Improve ansible-test match error handling. (cherry picked from commit 2056c981ae0fad9289337cb63c8b1b0d5b539368) * Improve error handling for docs-build test. (cherry picked from commit 2148999048179c623a31b0fac3bb02361ec42fe2) * Bug fixes and cleanup for ansible-test. (#45991) * Remove unused imports. * Clean up ConfigParser usage in ansible-test. * Fix bare except statements in ansible-test. * Miscellaneous cleanup from PyCharm inspections. * Enable pylint no-self-use for ansible-test. * Remove obsolete pylint ignores for Python 3.7. * Fix shellcheck issuers under newer shellcheck. * Use newer path for ansible-test. * Fix issues in code-smell tests. (cherry picked from commit ac492476e5389e17b8d401174f18b73e59a7fb06) * Fix integration test library search path. This prevents tests from loading modules outside the source tree, which could result in testing the wrong module if a system-wide install is present, or custom modules exist. (cherry picked from commit d603cd41feaef3d9beaa7f133ded59d6809b4916) * Update default container to version 1.2.0. (cherry picked from commit d478a4c3f6e02b48507070c3d1d63fd158890756) (cherry picked from commit 21c4eb8db50423a8184ded3b04fd81d737a4e0fb) * Fix ansible-test docker python version handling. This removes the old name based version detection behavior and uses versions defined in the docker completion file instead, as the new containers do not follow the old naming scheme. (cherry picked from commit 54937ba7848c3d10b31b85c46e3e8d41c98c5519) * Reduce noise in docs-build test failures. (cherry picked from commit 4085d016178fe4be15a52264fe903fd2932cefc7) * Fix ansible-test encoding issues for exceptions. (cherry picked from commit 0d7a156319f2b9f1786147bb717ec2b0d7bd6091) * Fix ansible-test multi-group smoke test handling. (#46363) * Fix ansible-test smoke tests across groups. * Fix ansible-test list arg defaults. * Fix ansible-test require and exclude delegation. * Fix detection of Windows specific changes. * Add minimal Windows testing for Python 3.7. (cherry picked from commit e53390b3b1afedc475294f25b9c2b847fa63a806) * Use default-test-container version 1.3.0. (cherry picked from commit 6d9be66418452a655b551e0796361273f3c7ac18) * Add file exists check in integration-aliases test. (cherry picked from commit 33a8be9109ff3bf77d21dfa0117238d0f081a0b1) * Improve ansible-test environment checking between tests. (#46459) * Add unified diff output to environment validation. This makes it easier to see where the environment changed. * Compare Python interpreters by version to pip shebangs. This helps expose cases where pip executables use a different Python interpreter than is expected. * Query `pip.__version__` instead of using `pip --version`. This is a much faster way to query the pip version. It also more closely matches how we invoke pip within ansible-test. * Remove redundant environment scan between tests. This reuses the environment scan from the end of the previous test as the basis for comparison during the next test. (cherry picked from commit 0dc7f3878794f6deecfcc642da45c951ca376069) * Add symlinks sanity test. (#46467) * Add symlinks sanity test. * Replace legacy test symlinks with actual content. * Remove dir symlink from template_jinja2_latest. * Update import test to use generated library dir. * Fix copy test symlink setup. (cherry picked from commit e2b60475147204ff5c06de3b4f0e2106ded064ff) * Fix parametrize warning in unit tests. (cherry picked from commit 1a28898a008b7c349bbd7a7604788678bc954e31) * Update MANIFEST.in (#46502) * Update MANIFEST.in: - Remove unnecessary prune. - Include files needed by tests. - Exclude botmeta sanity test. These changes permit sanity tests to pass on sdist output. (cherry picked from commit cbb49f66ecbba1547fe864cb2ff08ddbe0ad074c) * Fix unit tests which modify the source tree. (#45763) * Fix CNOS unit test log usage. * Use temp dir for Galaxy unit tests. * Write to temp files in interfaces_file unit test. * Fix log placement in netapp_e_ldap unit test. (cherry picked from commit 0686450cae86720c804d2f6b6d09fa3abba9dacc) * Fix ansible-test custom docker image traceback. (cherry picked from commit 712ad9ed64084b58058801258087667a6681939d) * ansible-test: Create public key creating Windows targets (#43760) * ansible-test: Create public key creating Windows targets * Changed to always set SSH Key for Windows hosts (cherry picked from commit adc0efe10c5be833b5138e1d8b0d0316f87c5241) * Fix and re-enable sts_assume_role integration tests (#46026) * Fix the STS assume role error message assertion when the role to assume does not exist. (cherry picked from commit 18dc928e28ae35bf9b786c8a48558ff83cc3a6a2) * Fix ACI unit test on Python 3.7.0. The previous logic was only needed for pre-release versions of 3.7. (cherry picked from commit c0bf9815c98c9ec00fc9648ae7a0f561684fc10e) * Remove placeboify from unit tests that are not calling AWS (i.e. creating a recording) (#45754) (cherry picked from commit 2167ce6cb6db57bf066dce83a5a03978a13bf1ef) * Update sanity test ignore entries.
2018-10-13 17:44:11 +00:00
# run unit tests unprivileged to prevent stray writes to the source tree
# also disconnect from the network once requirements have been installed
if isinstance(args, UnitsConfig):
writable_dirs = [
'/root/ansible/.pytest_cache',
]
docker_exec(args, test_id, ['mkdir', '-p'] + writable_dirs)
docker_exec(args, test_id, ['chmod', '777'] + writable_dirs)
docker_exec(args, test_id, ['find', '/root/ansible/test/results/', '-type', 'd', '-exec', 'chmod', '777', '{}', '+'])
docker_exec(args, test_id, ['chmod', '755', '/root'])
docker_exec(args, test_id, ['chmod', '644', '/root/ansible/%s' % args.metadata_path])
docker_exec(args, test_id, ['useradd', 'pytest', '--create-home'])
docker_exec(args, test_id, cmd + ['--requirements-mode', 'only'], options=cmd_options)
networks = get_docker_networks(args, test_id)
for network in networks:
docker_network_disconnect(args, test_id, network)
cmd += ['--requirements-mode', 'skip']
cmd_options += ['--user', 'pytest']
try:
docker_exec(args, test_id, cmd, options=cmd_options)
finally:
with tempfile.NamedTemporaryFile(prefix='ansible-result-', suffix='.tgz') as local_result_fd:
docker_exec(args, test_id, ['tar', 'czf', '/root/results.tgz', '-C', '/root/ansible/test', 'results'])
docker_get(args, test_id, '/root/results.tgz', local_result_fd.name)
run_command(args, ['tar', 'oxzf', local_result_fd.name, '-C', 'test'])
finally:
if httptester_id:
docker_rm(args, httptester_id)
if test_id:
docker_rm(args, test_id)
def delegate_remote(args, exclude, require, integration_targets):
"""
:type args: EnvironmentConfig
:type exclude: list[str]
:type require: list[str]
:type integration_targets: tuple[IntegrationTarget]
"""
parts = args.remote.split('/', 1)
platform = parts[0]
version = parts[1]
core_ci = AnsibleCoreCI(args, platform, version, stage=args.remote_stage, provider=args.remote_provider)
success = False
if isinstance(args, ShellConfig):
use_httptester = args.httptester
else:
use_httptester = args.httptester and any('needs/httptester/' in target.aliases for target in integration_targets)
if use_httptester and not docker_available():
display.warning('Assuming --disable-httptester since `docker` is not available.')
use_httptester = False
httptester_id = None
ssh_options = []
try:
core_ci.start()
if use_httptester:
httptester_id, ssh_options = start_httptester(args)
core_ci.wait()
Backport test infra fixes and updates to stable-2.5. (#46992) * Fix unit test parametrize order on Python 3.5. (cherry picked from commit 53b230ca746e8657d6aed09885568f0cf8dbc61e) * Fix ansible-test unit test execution. (#45772) * Fix ansible-test units requirements install. * Run unit tests as unprivileged user under Docker. (cherry picked from commit 379a7f4f5a0491964c7896834f3f326412888585) * Run unit tests in parallel. (#45812) (cherry picked from commit abe8e4c9e8bd9cdca70a7906b15beb57a52393ca) * Minor fixes for unit test delegation. (cherry picked from commit be199cfe90927d4e369597ee3c4b86401454614c) * add support for opening shell on remote Windows host (#43919) * add support for opening shell on remote Windows host * added arg completion and fix sanity check * remove uneeded arg (cherry picked from commit 6ca4ea0c1f20ff23f231bbe14a80fd3eafc87087) * Block network access for unit tests in docker. (cherry picked from commit 99cac99cbc3b49ad9fb39950d881e0f266775320) * Make ansible-test available in the bin directory. (#45876) (cherry picked from commit f3d1f9544ba67785e787ea303f81db74603780eb) * Support comments in ansible-test flat files. (cherry picked from commit 5a3000af19b81c1baf592e970683c7fd0ac0d43f) * Fix incorrect use of subprocess.CalledProcessError (#45890) (cherry picked from commit 24dd87bd0abeb41a8cf167f7f31ed7e8e4255ea3) * Improve ansible-test match error handling. (cherry picked from commit 2056c981ae0fad9289337cb63c8b1b0d5b539368) * Improve error handling for docs-build test. (cherry picked from commit 2148999048179c623a31b0fac3bb02361ec42fe2) * Bug fixes and cleanup for ansible-test. (#45991) * Remove unused imports. * Clean up ConfigParser usage in ansible-test. * Fix bare except statements in ansible-test. * Miscellaneous cleanup from PyCharm inspections. * Enable pylint no-self-use for ansible-test. * Remove obsolete pylint ignores for Python 3.7. * Fix shellcheck issuers under newer shellcheck. * Use newer path for ansible-test. * Fix issues in code-smell tests. (cherry picked from commit ac492476e5389e17b8d401174f18b73e59a7fb06) * Fix integration test library search path. This prevents tests from loading modules outside the source tree, which could result in testing the wrong module if a system-wide install is present, or custom modules exist. (cherry picked from commit d603cd41feaef3d9beaa7f133ded59d6809b4916) * Update default container to version 1.2.0. (cherry picked from commit d478a4c3f6e02b48507070c3d1d63fd158890756) (cherry picked from commit 21c4eb8db50423a8184ded3b04fd81d737a4e0fb) * Fix ansible-test docker python version handling. This removes the old name based version detection behavior and uses versions defined in the docker completion file instead, as the new containers do not follow the old naming scheme. (cherry picked from commit 54937ba7848c3d10b31b85c46e3e8d41c98c5519) * Reduce noise in docs-build test failures. (cherry picked from commit 4085d016178fe4be15a52264fe903fd2932cefc7) * Fix ansible-test encoding issues for exceptions. (cherry picked from commit 0d7a156319f2b9f1786147bb717ec2b0d7bd6091) * Fix ansible-test multi-group smoke test handling. (#46363) * Fix ansible-test smoke tests across groups. * Fix ansible-test list arg defaults. * Fix ansible-test require and exclude delegation. * Fix detection of Windows specific changes. * Add minimal Windows testing for Python 3.7. (cherry picked from commit e53390b3b1afedc475294f25b9c2b847fa63a806) * Use default-test-container version 1.3.0. (cherry picked from commit 6d9be66418452a655b551e0796361273f3c7ac18) * Add file exists check in integration-aliases test. (cherry picked from commit 33a8be9109ff3bf77d21dfa0117238d0f081a0b1) * Improve ansible-test environment checking between tests. (#46459) * Add unified diff output to environment validation. This makes it easier to see where the environment changed. * Compare Python interpreters by version to pip shebangs. This helps expose cases where pip executables use a different Python interpreter than is expected. * Query `pip.__version__` instead of using `pip --version`. This is a much faster way to query the pip version. It also more closely matches how we invoke pip within ansible-test. * Remove redundant environment scan between tests. This reuses the environment scan from the end of the previous test as the basis for comparison during the next test. (cherry picked from commit 0dc7f3878794f6deecfcc642da45c951ca376069) * Add symlinks sanity test. (#46467) * Add symlinks sanity test. * Replace legacy test symlinks with actual content. * Remove dir symlink from template_jinja2_latest. * Update import test to use generated library dir. * Fix copy test symlink setup. (cherry picked from commit e2b60475147204ff5c06de3b4f0e2106ded064ff) * Fix parametrize warning in unit tests. (cherry picked from commit 1a28898a008b7c349bbd7a7604788678bc954e31) * Update MANIFEST.in (#46502) * Update MANIFEST.in: - Remove unnecessary prune. - Include files needed by tests. - Exclude botmeta sanity test. These changes permit sanity tests to pass on sdist output. (cherry picked from commit cbb49f66ecbba1547fe864cb2ff08ddbe0ad074c) * Fix unit tests which modify the source tree. (#45763) * Fix CNOS unit test log usage. * Use temp dir for Galaxy unit tests. * Write to temp files in interfaces_file unit test. * Fix log placement in netapp_e_ldap unit test. (cherry picked from commit 0686450cae86720c804d2f6b6d09fa3abba9dacc) * Fix ansible-test custom docker image traceback. (cherry picked from commit 712ad9ed64084b58058801258087667a6681939d) * ansible-test: Create public key creating Windows targets (#43760) * ansible-test: Create public key creating Windows targets * Changed to always set SSH Key for Windows hosts (cherry picked from commit adc0efe10c5be833b5138e1d8b0d0316f87c5241) * Fix and re-enable sts_assume_role integration tests (#46026) * Fix the STS assume role error message assertion when the role to assume does not exist. (cherry picked from commit 18dc928e28ae35bf9b786c8a48558ff83cc3a6a2) * Fix ACI unit test on Python 3.7.0. The previous logic was only needed for pre-release versions of 3.7. (cherry picked from commit c0bf9815c98c9ec00fc9648ae7a0f561684fc10e) * Remove placeboify from unit tests that are not calling AWS (i.e. creating a recording) (#45754) (cherry picked from commit 2167ce6cb6db57bf066dce83a5a03978a13bf1ef) * Update sanity test ignore entries.
2018-10-13 17:44:11 +00:00
if platform == 'windows':
# Windows doesn't need the ansible-test fluff, just run the SSH command
manage = ManageWindowsCI(core_ci)
cmd = ['powershell.exe']
else:
options = {
'--remote': 1,
}
Backport test infra fixes and updates to stable-2.5. (#46992) * Fix unit test parametrize order on Python 3.5. (cherry picked from commit 53b230ca746e8657d6aed09885568f0cf8dbc61e) * Fix ansible-test unit test execution. (#45772) * Fix ansible-test units requirements install. * Run unit tests as unprivileged user under Docker. (cherry picked from commit 379a7f4f5a0491964c7896834f3f326412888585) * Run unit tests in parallel. (#45812) (cherry picked from commit abe8e4c9e8bd9cdca70a7906b15beb57a52393ca) * Minor fixes for unit test delegation. (cherry picked from commit be199cfe90927d4e369597ee3c4b86401454614c) * add support for opening shell on remote Windows host (#43919) * add support for opening shell on remote Windows host * added arg completion and fix sanity check * remove uneeded arg (cherry picked from commit 6ca4ea0c1f20ff23f231bbe14a80fd3eafc87087) * Block network access for unit tests in docker. (cherry picked from commit 99cac99cbc3b49ad9fb39950d881e0f266775320) * Make ansible-test available in the bin directory. (#45876) (cherry picked from commit f3d1f9544ba67785e787ea303f81db74603780eb) * Support comments in ansible-test flat files. (cherry picked from commit 5a3000af19b81c1baf592e970683c7fd0ac0d43f) * Fix incorrect use of subprocess.CalledProcessError (#45890) (cherry picked from commit 24dd87bd0abeb41a8cf167f7f31ed7e8e4255ea3) * Improve ansible-test match error handling. (cherry picked from commit 2056c981ae0fad9289337cb63c8b1b0d5b539368) * Improve error handling for docs-build test. (cherry picked from commit 2148999048179c623a31b0fac3bb02361ec42fe2) * Bug fixes and cleanup for ansible-test. (#45991) * Remove unused imports. * Clean up ConfigParser usage in ansible-test. * Fix bare except statements in ansible-test. * Miscellaneous cleanup from PyCharm inspections. * Enable pylint no-self-use for ansible-test. * Remove obsolete pylint ignores for Python 3.7. * Fix shellcheck issuers under newer shellcheck. * Use newer path for ansible-test. * Fix issues in code-smell tests. (cherry picked from commit ac492476e5389e17b8d401174f18b73e59a7fb06) * Fix integration test library search path. This prevents tests from loading modules outside the source tree, which could result in testing the wrong module if a system-wide install is present, or custom modules exist. (cherry picked from commit d603cd41feaef3d9beaa7f133ded59d6809b4916) * Update default container to version 1.2.0. (cherry picked from commit d478a4c3f6e02b48507070c3d1d63fd158890756) (cherry picked from commit 21c4eb8db50423a8184ded3b04fd81d737a4e0fb) * Fix ansible-test docker python version handling. This removes the old name based version detection behavior and uses versions defined in the docker completion file instead, as the new containers do not follow the old naming scheme. (cherry picked from commit 54937ba7848c3d10b31b85c46e3e8d41c98c5519) * Reduce noise in docs-build test failures. (cherry picked from commit 4085d016178fe4be15a52264fe903fd2932cefc7) * Fix ansible-test encoding issues for exceptions. (cherry picked from commit 0d7a156319f2b9f1786147bb717ec2b0d7bd6091) * Fix ansible-test multi-group smoke test handling. (#46363) * Fix ansible-test smoke tests across groups. * Fix ansible-test list arg defaults. * Fix ansible-test require and exclude delegation. * Fix detection of Windows specific changes. * Add minimal Windows testing for Python 3.7. (cherry picked from commit e53390b3b1afedc475294f25b9c2b847fa63a806) * Use default-test-container version 1.3.0. (cherry picked from commit 6d9be66418452a655b551e0796361273f3c7ac18) * Add file exists check in integration-aliases test. (cherry picked from commit 33a8be9109ff3bf77d21dfa0117238d0f081a0b1) * Improve ansible-test environment checking between tests. (#46459) * Add unified diff output to environment validation. This makes it easier to see where the environment changed. * Compare Python interpreters by version to pip shebangs. This helps expose cases where pip executables use a different Python interpreter than is expected. * Query `pip.__version__` instead of using `pip --version`. This is a much faster way to query the pip version. It also more closely matches how we invoke pip within ansible-test. * Remove redundant environment scan between tests. This reuses the environment scan from the end of the previous test as the basis for comparison during the next test. (cherry picked from commit 0dc7f3878794f6deecfcc642da45c951ca376069) * Add symlinks sanity test. (#46467) * Add symlinks sanity test. * Replace legacy test symlinks with actual content. * Remove dir symlink from template_jinja2_latest. * Update import test to use generated library dir. * Fix copy test symlink setup. (cherry picked from commit e2b60475147204ff5c06de3b4f0e2106ded064ff) * Fix parametrize warning in unit tests. (cherry picked from commit 1a28898a008b7c349bbd7a7604788678bc954e31) * Update MANIFEST.in (#46502) * Update MANIFEST.in: - Remove unnecessary prune. - Include files needed by tests. - Exclude botmeta sanity test. These changes permit sanity tests to pass on sdist output. (cherry picked from commit cbb49f66ecbba1547fe864cb2ff08ddbe0ad074c) * Fix unit tests which modify the source tree. (#45763) * Fix CNOS unit test log usage. * Use temp dir for Galaxy unit tests. * Write to temp files in interfaces_file unit test. * Fix log placement in netapp_e_ldap unit test. (cherry picked from commit 0686450cae86720c804d2f6b6d09fa3abba9dacc) * Fix ansible-test custom docker image traceback. (cherry picked from commit 712ad9ed64084b58058801258087667a6681939d) * ansible-test: Create public key creating Windows targets (#43760) * ansible-test: Create public key creating Windows targets * Changed to always set SSH Key for Windows hosts (cherry picked from commit adc0efe10c5be833b5138e1d8b0d0316f87c5241) * Fix and re-enable sts_assume_role integration tests (#46026) * Fix the STS assume role error message assertion when the role to assume does not exist. (cherry picked from commit 18dc928e28ae35bf9b786c8a48558ff83cc3a6a2) * Fix ACI unit test on Python 3.7.0. The previous logic was only needed for pre-release versions of 3.7. (cherry picked from commit c0bf9815c98c9ec00fc9648ae7a0f561684fc10e) * Remove placeboify from unit tests that are not calling AWS (i.e. creating a recording) (#45754) (cherry picked from commit 2167ce6cb6db57bf066dce83a5a03978a13bf1ef) * Update sanity test ignore entries.
2018-10-13 17:44:11 +00:00
cmd = generate_command(args, 'ansible/bin/ansible-test', options, exclude, require)
Backport test infra fixes and updates to stable-2.5. (#46992) * Fix unit test parametrize order on Python 3.5. (cherry picked from commit 53b230ca746e8657d6aed09885568f0cf8dbc61e) * Fix ansible-test unit test execution. (#45772) * Fix ansible-test units requirements install. * Run unit tests as unprivileged user under Docker. (cherry picked from commit 379a7f4f5a0491964c7896834f3f326412888585) * Run unit tests in parallel. (#45812) (cherry picked from commit abe8e4c9e8bd9cdca70a7906b15beb57a52393ca) * Minor fixes for unit test delegation. (cherry picked from commit be199cfe90927d4e369597ee3c4b86401454614c) * add support for opening shell on remote Windows host (#43919) * add support for opening shell on remote Windows host * added arg completion and fix sanity check * remove uneeded arg (cherry picked from commit 6ca4ea0c1f20ff23f231bbe14a80fd3eafc87087) * Block network access for unit tests in docker. (cherry picked from commit 99cac99cbc3b49ad9fb39950d881e0f266775320) * Make ansible-test available in the bin directory. (#45876) (cherry picked from commit f3d1f9544ba67785e787ea303f81db74603780eb) * Support comments in ansible-test flat files. (cherry picked from commit 5a3000af19b81c1baf592e970683c7fd0ac0d43f) * Fix incorrect use of subprocess.CalledProcessError (#45890) (cherry picked from commit 24dd87bd0abeb41a8cf167f7f31ed7e8e4255ea3) * Improve ansible-test match error handling. (cherry picked from commit 2056c981ae0fad9289337cb63c8b1b0d5b539368) * Improve error handling for docs-build test. (cherry picked from commit 2148999048179c623a31b0fac3bb02361ec42fe2) * Bug fixes and cleanup for ansible-test. (#45991) * Remove unused imports. * Clean up ConfigParser usage in ansible-test. * Fix bare except statements in ansible-test. * Miscellaneous cleanup from PyCharm inspections. * Enable pylint no-self-use for ansible-test. * Remove obsolete pylint ignores for Python 3.7. * Fix shellcheck issuers under newer shellcheck. * Use newer path for ansible-test. * Fix issues in code-smell tests. (cherry picked from commit ac492476e5389e17b8d401174f18b73e59a7fb06) * Fix integration test library search path. This prevents tests from loading modules outside the source tree, which could result in testing the wrong module if a system-wide install is present, or custom modules exist. (cherry picked from commit d603cd41feaef3d9beaa7f133ded59d6809b4916) * Update default container to version 1.2.0. (cherry picked from commit d478a4c3f6e02b48507070c3d1d63fd158890756) (cherry picked from commit 21c4eb8db50423a8184ded3b04fd81d737a4e0fb) * Fix ansible-test docker python version handling. This removes the old name based version detection behavior and uses versions defined in the docker completion file instead, as the new containers do not follow the old naming scheme. (cherry picked from commit 54937ba7848c3d10b31b85c46e3e8d41c98c5519) * Reduce noise in docs-build test failures. (cherry picked from commit 4085d016178fe4be15a52264fe903fd2932cefc7) * Fix ansible-test encoding issues for exceptions. (cherry picked from commit 0d7a156319f2b9f1786147bb717ec2b0d7bd6091) * Fix ansible-test multi-group smoke test handling. (#46363) * Fix ansible-test smoke tests across groups. * Fix ansible-test list arg defaults. * Fix ansible-test require and exclude delegation. * Fix detection of Windows specific changes. * Add minimal Windows testing for Python 3.7. (cherry picked from commit e53390b3b1afedc475294f25b9c2b847fa63a806) * Use default-test-container version 1.3.0. (cherry picked from commit 6d9be66418452a655b551e0796361273f3c7ac18) * Add file exists check in integration-aliases test. (cherry picked from commit 33a8be9109ff3bf77d21dfa0117238d0f081a0b1) * Improve ansible-test environment checking between tests. (#46459) * Add unified diff output to environment validation. This makes it easier to see where the environment changed. * Compare Python interpreters by version to pip shebangs. This helps expose cases where pip executables use a different Python interpreter than is expected. * Query `pip.__version__` instead of using `pip --version`. This is a much faster way to query the pip version. It also more closely matches how we invoke pip within ansible-test. * Remove redundant environment scan between tests. This reuses the environment scan from the end of the previous test as the basis for comparison during the next test. (cherry picked from commit 0dc7f3878794f6deecfcc642da45c951ca376069) * Add symlinks sanity test. (#46467) * Add symlinks sanity test. * Replace legacy test symlinks with actual content. * Remove dir symlink from template_jinja2_latest. * Update import test to use generated library dir. * Fix copy test symlink setup. (cherry picked from commit e2b60475147204ff5c06de3b4f0e2106ded064ff) * Fix parametrize warning in unit tests. (cherry picked from commit 1a28898a008b7c349bbd7a7604788678bc954e31) * Update MANIFEST.in (#46502) * Update MANIFEST.in: - Remove unnecessary prune. - Include files needed by tests. - Exclude botmeta sanity test. These changes permit sanity tests to pass on sdist output. (cherry picked from commit cbb49f66ecbba1547fe864cb2ff08ddbe0ad074c) * Fix unit tests which modify the source tree. (#45763) * Fix CNOS unit test log usage. * Use temp dir for Galaxy unit tests. * Write to temp files in interfaces_file unit test. * Fix log placement in netapp_e_ldap unit test. (cherry picked from commit 0686450cae86720c804d2f6b6d09fa3abba9dacc) * Fix ansible-test custom docker image traceback. (cherry picked from commit 712ad9ed64084b58058801258087667a6681939d) * ansible-test: Create public key creating Windows targets (#43760) * ansible-test: Create public key creating Windows targets * Changed to always set SSH Key for Windows hosts (cherry picked from commit adc0efe10c5be833b5138e1d8b0d0316f87c5241) * Fix and re-enable sts_assume_role integration tests (#46026) * Fix the STS assume role error message assertion when the role to assume does not exist. (cherry picked from commit 18dc928e28ae35bf9b786c8a48558ff83cc3a6a2) * Fix ACI unit test on Python 3.7.0. The previous logic was only needed for pre-release versions of 3.7. (cherry picked from commit c0bf9815c98c9ec00fc9648ae7a0f561684fc10e) * Remove placeboify from unit tests that are not calling AWS (i.e. creating a recording) (#45754) (cherry picked from commit 2167ce6cb6db57bf066dce83a5a03978a13bf1ef) * Update sanity test ignore entries.
2018-10-13 17:44:11 +00:00
if httptester_id:
cmd += ['--inject-httptester']
Backport test infra fixes and updates to stable-2.5. (#46992) * Fix unit test parametrize order on Python 3.5. (cherry picked from commit 53b230ca746e8657d6aed09885568f0cf8dbc61e) * Fix ansible-test unit test execution. (#45772) * Fix ansible-test units requirements install. * Run unit tests as unprivileged user under Docker. (cherry picked from commit 379a7f4f5a0491964c7896834f3f326412888585) * Run unit tests in parallel. (#45812) (cherry picked from commit abe8e4c9e8bd9cdca70a7906b15beb57a52393ca) * Minor fixes for unit test delegation. (cherry picked from commit be199cfe90927d4e369597ee3c4b86401454614c) * add support for opening shell on remote Windows host (#43919) * add support for opening shell on remote Windows host * added arg completion and fix sanity check * remove uneeded arg (cherry picked from commit 6ca4ea0c1f20ff23f231bbe14a80fd3eafc87087) * Block network access for unit tests in docker. (cherry picked from commit 99cac99cbc3b49ad9fb39950d881e0f266775320) * Make ansible-test available in the bin directory. (#45876) (cherry picked from commit f3d1f9544ba67785e787ea303f81db74603780eb) * Support comments in ansible-test flat files. (cherry picked from commit 5a3000af19b81c1baf592e970683c7fd0ac0d43f) * Fix incorrect use of subprocess.CalledProcessError (#45890) (cherry picked from commit 24dd87bd0abeb41a8cf167f7f31ed7e8e4255ea3) * Improve ansible-test match error handling. (cherry picked from commit 2056c981ae0fad9289337cb63c8b1b0d5b539368) * Improve error handling for docs-build test. (cherry picked from commit 2148999048179c623a31b0fac3bb02361ec42fe2) * Bug fixes and cleanup for ansible-test. (#45991) * Remove unused imports. * Clean up ConfigParser usage in ansible-test. * Fix bare except statements in ansible-test. * Miscellaneous cleanup from PyCharm inspections. * Enable pylint no-self-use for ansible-test. * Remove obsolete pylint ignores for Python 3.7. * Fix shellcheck issuers under newer shellcheck. * Use newer path for ansible-test. * Fix issues in code-smell tests. (cherry picked from commit ac492476e5389e17b8d401174f18b73e59a7fb06) * Fix integration test library search path. This prevents tests from loading modules outside the source tree, which could result in testing the wrong module if a system-wide install is present, or custom modules exist. (cherry picked from commit d603cd41feaef3d9beaa7f133ded59d6809b4916) * Update default container to version 1.2.0. (cherry picked from commit d478a4c3f6e02b48507070c3d1d63fd158890756) (cherry picked from commit 21c4eb8db50423a8184ded3b04fd81d737a4e0fb) * Fix ansible-test docker python version handling. This removes the old name based version detection behavior and uses versions defined in the docker completion file instead, as the new containers do not follow the old naming scheme. (cherry picked from commit 54937ba7848c3d10b31b85c46e3e8d41c98c5519) * Reduce noise in docs-build test failures. (cherry picked from commit 4085d016178fe4be15a52264fe903fd2932cefc7) * Fix ansible-test encoding issues for exceptions. (cherry picked from commit 0d7a156319f2b9f1786147bb717ec2b0d7bd6091) * Fix ansible-test multi-group smoke test handling. (#46363) * Fix ansible-test smoke tests across groups. * Fix ansible-test list arg defaults. * Fix ansible-test require and exclude delegation. * Fix detection of Windows specific changes. * Add minimal Windows testing for Python 3.7. (cherry picked from commit e53390b3b1afedc475294f25b9c2b847fa63a806) * Use default-test-container version 1.3.0. (cherry picked from commit 6d9be66418452a655b551e0796361273f3c7ac18) * Add file exists check in integration-aliases test. (cherry picked from commit 33a8be9109ff3bf77d21dfa0117238d0f081a0b1) * Improve ansible-test environment checking between tests. (#46459) * Add unified diff output to environment validation. This makes it easier to see where the environment changed. * Compare Python interpreters by version to pip shebangs. This helps expose cases where pip executables use a different Python interpreter than is expected. * Query `pip.__version__` instead of using `pip --version`. This is a much faster way to query the pip version. It also more closely matches how we invoke pip within ansible-test. * Remove redundant environment scan between tests. This reuses the environment scan from the end of the previous test as the basis for comparison during the next test. (cherry picked from commit 0dc7f3878794f6deecfcc642da45c951ca376069) * Add symlinks sanity test. (#46467) * Add symlinks sanity test. * Replace legacy test symlinks with actual content. * Remove dir symlink from template_jinja2_latest. * Update import test to use generated library dir. * Fix copy test symlink setup. (cherry picked from commit e2b60475147204ff5c06de3b4f0e2106ded064ff) * Fix parametrize warning in unit tests. (cherry picked from commit 1a28898a008b7c349bbd7a7604788678bc954e31) * Update MANIFEST.in (#46502) * Update MANIFEST.in: - Remove unnecessary prune. - Include files needed by tests. - Exclude botmeta sanity test. These changes permit sanity tests to pass on sdist output. (cherry picked from commit cbb49f66ecbba1547fe864cb2ff08ddbe0ad074c) * Fix unit tests which modify the source tree. (#45763) * Fix CNOS unit test log usage. * Use temp dir for Galaxy unit tests. * Write to temp files in interfaces_file unit test. * Fix log placement in netapp_e_ldap unit test. (cherry picked from commit 0686450cae86720c804d2f6b6d09fa3abba9dacc) * Fix ansible-test custom docker image traceback. (cherry picked from commit 712ad9ed64084b58058801258087667a6681939d) * ansible-test: Create public key creating Windows targets (#43760) * ansible-test: Create public key creating Windows targets * Changed to always set SSH Key for Windows hosts (cherry picked from commit adc0efe10c5be833b5138e1d8b0d0316f87c5241) * Fix and re-enable sts_assume_role integration tests (#46026) * Fix the STS assume role error message assertion when the role to assume does not exist. (cherry picked from commit 18dc928e28ae35bf9b786c8a48558ff83cc3a6a2) * Fix ACI unit test on Python 3.7.0. The previous logic was only needed for pre-release versions of 3.7. (cherry picked from commit c0bf9815c98c9ec00fc9648ae7a0f561684fc10e) * Remove placeboify from unit tests that are not calling AWS (i.e. creating a recording) (#45754) (cherry picked from commit 2167ce6cb6db57bf066dce83a5a03978a13bf1ef) * Update sanity test ignore entries.
2018-10-13 17:44:11 +00:00
if isinstance(args, TestConfig):
if args.coverage and not args.coverage_label:
cmd += ['--coverage-label', 'remote-%s-%s' % (platform, version)]
Backport test infra fixes and updates to stable-2.5. (#46992) * Fix unit test parametrize order on Python 3.5. (cherry picked from commit 53b230ca746e8657d6aed09885568f0cf8dbc61e) * Fix ansible-test unit test execution. (#45772) * Fix ansible-test units requirements install. * Run unit tests as unprivileged user under Docker. (cherry picked from commit 379a7f4f5a0491964c7896834f3f326412888585) * Run unit tests in parallel. (#45812) (cherry picked from commit abe8e4c9e8bd9cdca70a7906b15beb57a52393ca) * Minor fixes for unit test delegation. (cherry picked from commit be199cfe90927d4e369597ee3c4b86401454614c) * add support for opening shell on remote Windows host (#43919) * add support for opening shell on remote Windows host * added arg completion and fix sanity check * remove uneeded arg (cherry picked from commit 6ca4ea0c1f20ff23f231bbe14a80fd3eafc87087) * Block network access for unit tests in docker. (cherry picked from commit 99cac99cbc3b49ad9fb39950d881e0f266775320) * Make ansible-test available in the bin directory. (#45876) (cherry picked from commit f3d1f9544ba67785e787ea303f81db74603780eb) * Support comments in ansible-test flat files. (cherry picked from commit 5a3000af19b81c1baf592e970683c7fd0ac0d43f) * Fix incorrect use of subprocess.CalledProcessError (#45890) (cherry picked from commit 24dd87bd0abeb41a8cf167f7f31ed7e8e4255ea3) * Improve ansible-test match error handling. (cherry picked from commit 2056c981ae0fad9289337cb63c8b1b0d5b539368) * Improve error handling for docs-build test. (cherry picked from commit 2148999048179c623a31b0fac3bb02361ec42fe2) * Bug fixes and cleanup for ansible-test. (#45991) * Remove unused imports. * Clean up ConfigParser usage in ansible-test. * Fix bare except statements in ansible-test. * Miscellaneous cleanup from PyCharm inspections. * Enable pylint no-self-use for ansible-test. * Remove obsolete pylint ignores for Python 3.7. * Fix shellcheck issuers under newer shellcheck. * Use newer path for ansible-test. * Fix issues in code-smell tests. (cherry picked from commit ac492476e5389e17b8d401174f18b73e59a7fb06) * Fix integration test library search path. This prevents tests from loading modules outside the source tree, which could result in testing the wrong module if a system-wide install is present, or custom modules exist. (cherry picked from commit d603cd41feaef3d9beaa7f133ded59d6809b4916) * Update default container to version 1.2.0. (cherry picked from commit d478a4c3f6e02b48507070c3d1d63fd158890756) (cherry picked from commit 21c4eb8db50423a8184ded3b04fd81d737a4e0fb) * Fix ansible-test docker python version handling. This removes the old name based version detection behavior and uses versions defined in the docker completion file instead, as the new containers do not follow the old naming scheme. (cherry picked from commit 54937ba7848c3d10b31b85c46e3e8d41c98c5519) * Reduce noise in docs-build test failures. (cherry picked from commit 4085d016178fe4be15a52264fe903fd2932cefc7) * Fix ansible-test encoding issues for exceptions. (cherry picked from commit 0d7a156319f2b9f1786147bb717ec2b0d7bd6091) * Fix ansible-test multi-group smoke test handling. (#46363) * Fix ansible-test smoke tests across groups. * Fix ansible-test list arg defaults. * Fix ansible-test require and exclude delegation. * Fix detection of Windows specific changes. * Add minimal Windows testing for Python 3.7. (cherry picked from commit e53390b3b1afedc475294f25b9c2b847fa63a806) * Use default-test-container version 1.3.0. (cherry picked from commit 6d9be66418452a655b551e0796361273f3c7ac18) * Add file exists check in integration-aliases test. (cherry picked from commit 33a8be9109ff3bf77d21dfa0117238d0f081a0b1) * Improve ansible-test environment checking between tests. (#46459) * Add unified diff output to environment validation. This makes it easier to see where the environment changed. * Compare Python interpreters by version to pip shebangs. This helps expose cases where pip executables use a different Python interpreter than is expected. * Query `pip.__version__` instead of using `pip --version`. This is a much faster way to query the pip version. It also more closely matches how we invoke pip within ansible-test. * Remove redundant environment scan between tests. This reuses the environment scan from the end of the previous test as the basis for comparison during the next test. (cherry picked from commit 0dc7f3878794f6deecfcc642da45c951ca376069) * Add symlinks sanity test. (#46467) * Add symlinks sanity test. * Replace legacy test symlinks with actual content. * Remove dir symlink from template_jinja2_latest. * Update import test to use generated library dir. * Fix copy test symlink setup. (cherry picked from commit e2b60475147204ff5c06de3b4f0e2106ded064ff) * Fix parametrize warning in unit tests. (cherry picked from commit 1a28898a008b7c349bbd7a7604788678bc954e31) * Update MANIFEST.in (#46502) * Update MANIFEST.in: - Remove unnecessary prune. - Include files needed by tests. - Exclude botmeta sanity test. These changes permit sanity tests to pass on sdist output. (cherry picked from commit cbb49f66ecbba1547fe864cb2ff08ddbe0ad074c) * Fix unit tests which modify the source tree. (#45763) * Fix CNOS unit test log usage. * Use temp dir for Galaxy unit tests. * Write to temp files in interfaces_file unit test. * Fix log placement in netapp_e_ldap unit test. (cherry picked from commit 0686450cae86720c804d2f6b6d09fa3abba9dacc) * Fix ansible-test custom docker image traceback. (cherry picked from commit 712ad9ed64084b58058801258087667a6681939d) * ansible-test: Create public key creating Windows targets (#43760) * ansible-test: Create public key creating Windows targets * Changed to always set SSH Key for Windows hosts (cherry picked from commit adc0efe10c5be833b5138e1d8b0d0316f87c5241) * Fix and re-enable sts_assume_role integration tests (#46026) * Fix the STS assume role error message assertion when the role to assume does not exist. (cherry picked from commit 18dc928e28ae35bf9b786c8a48558ff83cc3a6a2) * Fix ACI unit test on Python 3.7.0. The previous logic was only needed for pre-release versions of 3.7. (cherry picked from commit c0bf9815c98c9ec00fc9648ae7a0f561684fc10e) * Remove placeboify from unit tests that are not calling AWS (i.e. creating a recording) (#45754) (cherry picked from commit 2167ce6cb6db57bf066dce83a5a03978a13bf1ef) * Update sanity test ignore entries.
2018-10-13 17:44:11 +00:00
if isinstance(args, IntegrationConfig):
if not args.allow_destructive:
cmd.append('--allow-destructive')
Backport test infra fixes and updates to stable-2.5. (#46992) * Fix unit test parametrize order on Python 3.5. (cherry picked from commit 53b230ca746e8657d6aed09885568f0cf8dbc61e) * Fix ansible-test unit test execution. (#45772) * Fix ansible-test units requirements install. * Run unit tests as unprivileged user under Docker. (cherry picked from commit 379a7f4f5a0491964c7896834f3f326412888585) * Run unit tests in parallel. (#45812) (cherry picked from commit abe8e4c9e8bd9cdca70a7906b15beb57a52393ca) * Minor fixes for unit test delegation. (cherry picked from commit be199cfe90927d4e369597ee3c4b86401454614c) * add support for opening shell on remote Windows host (#43919) * add support for opening shell on remote Windows host * added arg completion and fix sanity check * remove uneeded arg (cherry picked from commit 6ca4ea0c1f20ff23f231bbe14a80fd3eafc87087) * Block network access for unit tests in docker. (cherry picked from commit 99cac99cbc3b49ad9fb39950d881e0f266775320) * Make ansible-test available in the bin directory. (#45876) (cherry picked from commit f3d1f9544ba67785e787ea303f81db74603780eb) * Support comments in ansible-test flat files. (cherry picked from commit 5a3000af19b81c1baf592e970683c7fd0ac0d43f) * Fix incorrect use of subprocess.CalledProcessError (#45890) (cherry picked from commit 24dd87bd0abeb41a8cf167f7f31ed7e8e4255ea3) * Improve ansible-test match error handling. (cherry picked from commit 2056c981ae0fad9289337cb63c8b1b0d5b539368) * Improve error handling for docs-build test. (cherry picked from commit 2148999048179c623a31b0fac3bb02361ec42fe2) * Bug fixes and cleanup for ansible-test. (#45991) * Remove unused imports. * Clean up ConfigParser usage in ansible-test. * Fix bare except statements in ansible-test. * Miscellaneous cleanup from PyCharm inspections. * Enable pylint no-self-use for ansible-test. * Remove obsolete pylint ignores for Python 3.7. * Fix shellcheck issuers under newer shellcheck. * Use newer path for ansible-test. * Fix issues in code-smell tests. (cherry picked from commit ac492476e5389e17b8d401174f18b73e59a7fb06) * Fix integration test library search path. This prevents tests from loading modules outside the source tree, which could result in testing the wrong module if a system-wide install is present, or custom modules exist. (cherry picked from commit d603cd41feaef3d9beaa7f133ded59d6809b4916) * Update default container to version 1.2.0. (cherry picked from commit d478a4c3f6e02b48507070c3d1d63fd158890756) (cherry picked from commit 21c4eb8db50423a8184ded3b04fd81d737a4e0fb) * Fix ansible-test docker python version handling. This removes the old name based version detection behavior and uses versions defined in the docker completion file instead, as the new containers do not follow the old naming scheme. (cherry picked from commit 54937ba7848c3d10b31b85c46e3e8d41c98c5519) * Reduce noise in docs-build test failures. (cherry picked from commit 4085d016178fe4be15a52264fe903fd2932cefc7) * Fix ansible-test encoding issues for exceptions. (cherry picked from commit 0d7a156319f2b9f1786147bb717ec2b0d7bd6091) * Fix ansible-test multi-group smoke test handling. (#46363) * Fix ansible-test smoke tests across groups. * Fix ansible-test list arg defaults. * Fix ansible-test require and exclude delegation. * Fix detection of Windows specific changes. * Add minimal Windows testing for Python 3.7. (cherry picked from commit e53390b3b1afedc475294f25b9c2b847fa63a806) * Use default-test-container version 1.3.0. (cherry picked from commit 6d9be66418452a655b551e0796361273f3c7ac18) * Add file exists check in integration-aliases test. (cherry picked from commit 33a8be9109ff3bf77d21dfa0117238d0f081a0b1) * Improve ansible-test environment checking between tests. (#46459) * Add unified diff output to environment validation. This makes it easier to see where the environment changed. * Compare Python interpreters by version to pip shebangs. This helps expose cases where pip executables use a different Python interpreter than is expected. * Query `pip.__version__` instead of using `pip --version`. This is a much faster way to query the pip version. It also more closely matches how we invoke pip within ansible-test. * Remove redundant environment scan between tests. This reuses the environment scan from the end of the previous test as the basis for comparison during the next test. (cherry picked from commit 0dc7f3878794f6deecfcc642da45c951ca376069) * Add symlinks sanity test. (#46467) * Add symlinks sanity test. * Replace legacy test symlinks with actual content. * Remove dir symlink from template_jinja2_latest. * Update import test to use generated library dir. * Fix copy test symlink setup. (cherry picked from commit e2b60475147204ff5c06de3b4f0e2106ded064ff) * Fix parametrize warning in unit tests. (cherry picked from commit 1a28898a008b7c349bbd7a7604788678bc954e31) * Update MANIFEST.in (#46502) * Update MANIFEST.in: - Remove unnecessary prune. - Include files needed by tests. - Exclude botmeta sanity test. These changes permit sanity tests to pass on sdist output. (cherry picked from commit cbb49f66ecbba1547fe864cb2ff08ddbe0ad074c) * Fix unit tests which modify the source tree. (#45763) * Fix CNOS unit test log usage. * Use temp dir for Galaxy unit tests. * Write to temp files in interfaces_file unit test. * Fix log placement in netapp_e_ldap unit test. (cherry picked from commit 0686450cae86720c804d2f6b6d09fa3abba9dacc) * Fix ansible-test custom docker image traceback. (cherry picked from commit 712ad9ed64084b58058801258087667a6681939d) * ansible-test: Create public key creating Windows targets (#43760) * ansible-test: Create public key creating Windows targets * Changed to always set SSH Key for Windows hosts (cherry picked from commit adc0efe10c5be833b5138e1d8b0d0316f87c5241) * Fix and re-enable sts_assume_role integration tests (#46026) * Fix the STS assume role error message assertion when the role to assume does not exist. (cherry picked from commit 18dc928e28ae35bf9b786c8a48558ff83cc3a6a2) * Fix ACI unit test on Python 3.7.0. The previous logic was only needed for pre-release versions of 3.7. (cherry picked from commit c0bf9815c98c9ec00fc9648ae7a0f561684fc10e) * Remove placeboify from unit tests that are not calling AWS (i.e. creating a recording) (#45754) (cherry picked from commit 2167ce6cb6db57bf066dce83a5a03978a13bf1ef) * Update sanity test ignore entries.
2018-10-13 17:44:11 +00:00
# remote instances are only expected to have a single python version available
if isinstance(args, UnitsConfig) and not args.python:
cmd += ['--python', 'default']
Backport test infra fixes and updates to stable-2.5. (#46992) * Fix unit test parametrize order on Python 3.5. (cherry picked from commit 53b230ca746e8657d6aed09885568f0cf8dbc61e) * Fix ansible-test unit test execution. (#45772) * Fix ansible-test units requirements install. * Run unit tests as unprivileged user under Docker. (cherry picked from commit 379a7f4f5a0491964c7896834f3f326412888585) * Run unit tests in parallel. (#45812) (cherry picked from commit abe8e4c9e8bd9cdca70a7906b15beb57a52393ca) * Minor fixes for unit test delegation. (cherry picked from commit be199cfe90927d4e369597ee3c4b86401454614c) * add support for opening shell on remote Windows host (#43919) * add support for opening shell on remote Windows host * added arg completion and fix sanity check * remove uneeded arg (cherry picked from commit 6ca4ea0c1f20ff23f231bbe14a80fd3eafc87087) * Block network access for unit tests in docker. (cherry picked from commit 99cac99cbc3b49ad9fb39950d881e0f266775320) * Make ansible-test available in the bin directory. (#45876) (cherry picked from commit f3d1f9544ba67785e787ea303f81db74603780eb) * Support comments in ansible-test flat files. (cherry picked from commit 5a3000af19b81c1baf592e970683c7fd0ac0d43f) * Fix incorrect use of subprocess.CalledProcessError (#45890) (cherry picked from commit 24dd87bd0abeb41a8cf167f7f31ed7e8e4255ea3) * Improve ansible-test match error handling. (cherry picked from commit 2056c981ae0fad9289337cb63c8b1b0d5b539368) * Improve error handling for docs-build test. (cherry picked from commit 2148999048179c623a31b0fac3bb02361ec42fe2) * Bug fixes and cleanup for ansible-test. (#45991) * Remove unused imports. * Clean up ConfigParser usage in ansible-test. * Fix bare except statements in ansible-test. * Miscellaneous cleanup from PyCharm inspections. * Enable pylint no-self-use for ansible-test. * Remove obsolete pylint ignores for Python 3.7. * Fix shellcheck issuers under newer shellcheck. * Use newer path for ansible-test. * Fix issues in code-smell tests. (cherry picked from commit ac492476e5389e17b8d401174f18b73e59a7fb06) * Fix integration test library search path. This prevents tests from loading modules outside the source tree, which could result in testing the wrong module if a system-wide install is present, or custom modules exist. (cherry picked from commit d603cd41feaef3d9beaa7f133ded59d6809b4916) * Update default container to version 1.2.0. (cherry picked from commit d478a4c3f6e02b48507070c3d1d63fd158890756) (cherry picked from commit 21c4eb8db50423a8184ded3b04fd81d737a4e0fb) * Fix ansible-test docker python version handling. This removes the old name based version detection behavior and uses versions defined in the docker completion file instead, as the new containers do not follow the old naming scheme. (cherry picked from commit 54937ba7848c3d10b31b85c46e3e8d41c98c5519) * Reduce noise in docs-build test failures. (cherry picked from commit 4085d016178fe4be15a52264fe903fd2932cefc7) * Fix ansible-test encoding issues for exceptions. (cherry picked from commit 0d7a156319f2b9f1786147bb717ec2b0d7bd6091) * Fix ansible-test multi-group smoke test handling. (#46363) * Fix ansible-test smoke tests across groups. * Fix ansible-test list arg defaults. * Fix ansible-test require and exclude delegation. * Fix detection of Windows specific changes. * Add minimal Windows testing for Python 3.7. (cherry picked from commit e53390b3b1afedc475294f25b9c2b847fa63a806) * Use default-test-container version 1.3.0. (cherry picked from commit 6d9be66418452a655b551e0796361273f3c7ac18) * Add file exists check in integration-aliases test. (cherry picked from commit 33a8be9109ff3bf77d21dfa0117238d0f081a0b1) * Improve ansible-test environment checking between tests. (#46459) * Add unified diff output to environment validation. This makes it easier to see where the environment changed. * Compare Python interpreters by version to pip shebangs. This helps expose cases where pip executables use a different Python interpreter than is expected. * Query `pip.__version__` instead of using `pip --version`. This is a much faster way to query the pip version. It also more closely matches how we invoke pip within ansible-test. * Remove redundant environment scan between tests. This reuses the environment scan from the end of the previous test as the basis for comparison during the next test. (cherry picked from commit 0dc7f3878794f6deecfcc642da45c951ca376069) * Add symlinks sanity test. (#46467) * Add symlinks sanity test. * Replace legacy test symlinks with actual content. * Remove dir symlink from template_jinja2_latest. * Update import test to use generated library dir. * Fix copy test symlink setup. (cherry picked from commit e2b60475147204ff5c06de3b4f0e2106ded064ff) * Fix parametrize warning in unit tests. (cherry picked from commit 1a28898a008b7c349bbd7a7604788678bc954e31) * Update MANIFEST.in (#46502) * Update MANIFEST.in: - Remove unnecessary prune. - Include files needed by tests. - Exclude botmeta sanity test. These changes permit sanity tests to pass on sdist output. (cherry picked from commit cbb49f66ecbba1547fe864cb2ff08ddbe0ad074c) * Fix unit tests which modify the source tree. (#45763) * Fix CNOS unit test log usage. * Use temp dir for Galaxy unit tests. * Write to temp files in interfaces_file unit test. * Fix log placement in netapp_e_ldap unit test. (cherry picked from commit 0686450cae86720c804d2f6b6d09fa3abba9dacc) * Fix ansible-test custom docker image traceback. (cherry picked from commit 712ad9ed64084b58058801258087667a6681939d) * ansible-test: Create public key creating Windows targets (#43760) * ansible-test: Create public key creating Windows targets * Changed to always set SSH Key for Windows hosts (cherry picked from commit adc0efe10c5be833b5138e1d8b0d0316f87c5241) * Fix and re-enable sts_assume_role integration tests (#46026) * Fix the STS assume role error message assertion when the role to assume does not exist. (cherry picked from commit 18dc928e28ae35bf9b786c8a48558ff83cc3a6a2) * Fix ACI unit test on Python 3.7.0. The previous logic was only needed for pre-release versions of 3.7. (cherry picked from commit c0bf9815c98c9ec00fc9648ae7a0f561684fc10e) * Remove placeboify from unit tests that are not calling AWS (i.e. creating a recording) (#45754) (cherry picked from commit 2167ce6cb6db57bf066dce83a5a03978a13bf1ef) * Update sanity test ignore entries.
2018-10-13 17:44:11 +00:00
manage = ManagePosixCI(core_ci)
Backport test infra fixes and updates to stable-2.5. (#46992) * Fix unit test parametrize order on Python 3.5. (cherry picked from commit 53b230ca746e8657d6aed09885568f0cf8dbc61e) * Fix ansible-test unit test execution. (#45772) * Fix ansible-test units requirements install. * Run unit tests as unprivileged user under Docker. (cherry picked from commit 379a7f4f5a0491964c7896834f3f326412888585) * Run unit tests in parallel. (#45812) (cherry picked from commit abe8e4c9e8bd9cdca70a7906b15beb57a52393ca) * Minor fixes for unit test delegation. (cherry picked from commit be199cfe90927d4e369597ee3c4b86401454614c) * add support for opening shell on remote Windows host (#43919) * add support for opening shell on remote Windows host * added arg completion and fix sanity check * remove uneeded arg (cherry picked from commit 6ca4ea0c1f20ff23f231bbe14a80fd3eafc87087) * Block network access for unit tests in docker. (cherry picked from commit 99cac99cbc3b49ad9fb39950d881e0f266775320) * Make ansible-test available in the bin directory. (#45876) (cherry picked from commit f3d1f9544ba67785e787ea303f81db74603780eb) * Support comments in ansible-test flat files. (cherry picked from commit 5a3000af19b81c1baf592e970683c7fd0ac0d43f) * Fix incorrect use of subprocess.CalledProcessError (#45890) (cherry picked from commit 24dd87bd0abeb41a8cf167f7f31ed7e8e4255ea3) * Improve ansible-test match error handling. (cherry picked from commit 2056c981ae0fad9289337cb63c8b1b0d5b539368) * Improve error handling for docs-build test. (cherry picked from commit 2148999048179c623a31b0fac3bb02361ec42fe2) * Bug fixes and cleanup for ansible-test. (#45991) * Remove unused imports. * Clean up ConfigParser usage in ansible-test. * Fix bare except statements in ansible-test. * Miscellaneous cleanup from PyCharm inspections. * Enable pylint no-self-use for ansible-test. * Remove obsolete pylint ignores for Python 3.7. * Fix shellcheck issuers under newer shellcheck. * Use newer path for ansible-test. * Fix issues in code-smell tests. (cherry picked from commit ac492476e5389e17b8d401174f18b73e59a7fb06) * Fix integration test library search path. This prevents tests from loading modules outside the source tree, which could result in testing the wrong module if a system-wide install is present, or custom modules exist. (cherry picked from commit d603cd41feaef3d9beaa7f133ded59d6809b4916) * Update default container to version 1.2.0. (cherry picked from commit d478a4c3f6e02b48507070c3d1d63fd158890756) (cherry picked from commit 21c4eb8db50423a8184ded3b04fd81d737a4e0fb) * Fix ansible-test docker python version handling. This removes the old name based version detection behavior and uses versions defined in the docker completion file instead, as the new containers do not follow the old naming scheme. (cherry picked from commit 54937ba7848c3d10b31b85c46e3e8d41c98c5519) * Reduce noise in docs-build test failures. (cherry picked from commit 4085d016178fe4be15a52264fe903fd2932cefc7) * Fix ansible-test encoding issues for exceptions. (cherry picked from commit 0d7a156319f2b9f1786147bb717ec2b0d7bd6091) * Fix ansible-test multi-group smoke test handling. (#46363) * Fix ansible-test smoke tests across groups. * Fix ansible-test list arg defaults. * Fix ansible-test require and exclude delegation. * Fix detection of Windows specific changes. * Add minimal Windows testing for Python 3.7. (cherry picked from commit e53390b3b1afedc475294f25b9c2b847fa63a806) * Use default-test-container version 1.3.0. (cherry picked from commit 6d9be66418452a655b551e0796361273f3c7ac18) * Add file exists check in integration-aliases test. (cherry picked from commit 33a8be9109ff3bf77d21dfa0117238d0f081a0b1) * Improve ansible-test environment checking between tests. (#46459) * Add unified diff output to environment validation. This makes it easier to see where the environment changed. * Compare Python interpreters by version to pip shebangs. This helps expose cases where pip executables use a different Python interpreter than is expected. * Query `pip.__version__` instead of using `pip --version`. This is a much faster way to query the pip version. It also more closely matches how we invoke pip within ansible-test. * Remove redundant environment scan between tests. This reuses the environment scan from the end of the previous test as the basis for comparison during the next test. (cherry picked from commit 0dc7f3878794f6deecfcc642da45c951ca376069) * Add symlinks sanity test. (#46467) * Add symlinks sanity test. * Replace legacy test symlinks with actual content. * Remove dir symlink from template_jinja2_latest. * Update import test to use generated library dir. * Fix copy test symlink setup. (cherry picked from commit e2b60475147204ff5c06de3b4f0e2106ded064ff) * Fix parametrize warning in unit tests. (cherry picked from commit 1a28898a008b7c349bbd7a7604788678bc954e31) * Update MANIFEST.in (#46502) * Update MANIFEST.in: - Remove unnecessary prune. - Include files needed by tests. - Exclude botmeta sanity test. These changes permit sanity tests to pass on sdist output. (cherry picked from commit cbb49f66ecbba1547fe864cb2ff08ddbe0ad074c) * Fix unit tests which modify the source tree. (#45763) * Fix CNOS unit test log usage. * Use temp dir for Galaxy unit tests. * Write to temp files in interfaces_file unit test. * Fix log placement in netapp_e_ldap unit test. (cherry picked from commit 0686450cae86720c804d2f6b6d09fa3abba9dacc) * Fix ansible-test custom docker image traceback. (cherry picked from commit 712ad9ed64084b58058801258087667a6681939d) * ansible-test: Create public key creating Windows targets (#43760) * ansible-test: Create public key creating Windows targets * Changed to always set SSH Key for Windows hosts (cherry picked from commit adc0efe10c5be833b5138e1d8b0d0316f87c5241) * Fix and re-enable sts_assume_role integration tests (#46026) * Fix the STS assume role error message assertion when the role to assume does not exist. (cherry picked from commit 18dc928e28ae35bf9b786c8a48558ff83cc3a6a2) * Fix ACI unit test on Python 3.7.0. The previous logic was only needed for pre-release versions of 3.7. (cherry picked from commit c0bf9815c98c9ec00fc9648ae7a0f561684fc10e) * Remove placeboify from unit tests that are not calling AWS (i.e. creating a recording) (#45754) (cherry picked from commit 2167ce6cb6db57bf066dce83a5a03978a13bf1ef) * Update sanity test ignore entries.
2018-10-13 17:44:11 +00:00
manage.setup()
if isinstance(args, IntegrationConfig):
cloud_platforms = get_cloud_providers(args)
for cloud_platform in cloud_platforms:
ssh_options += cloud_platform.get_remote_ssh_options()
try:
manage.ssh(cmd, ssh_options)
success = True
finally:
Backport test infra fixes and updates to stable-2.5. (#46992) * Fix unit test parametrize order on Python 3.5. (cherry picked from commit 53b230ca746e8657d6aed09885568f0cf8dbc61e) * Fix ansible-test unit test execution. (#45772) * Fix ansible-test units requirements install. * Run unit tests as unprivileged user under Docker. (cherry picked from commit 379a7f4f5a0491964c7896834f3f326412888585) * Run unit tests in parallel. (#45812) (cherry picked from commit abe8e4c9e8bd9cdca70a7906b15beb57a52393ca) * Minor fixes for unit test delegation. (cherry picked from commit be199cfe90927d4e369597ee3c4b86401454614c) * add support for opening shell on remote Windows host (#43919) * add support for opening shell on remote Windows host * added arg completion and fix sanity check * remove uneeded arg (cherry picked from commit 6ca4ea0c1f20ff23f231bbe14a80fd3eafc87087) * Block network access for unit tests in docker. (cherry picked from commit 99cac99cbc3b49ad9fb39950d881e0f266775320) * Make ansible-test available in the bin directory. (#45876) (cherry picked from commit f3d1f9544ba67785e787ea303f81db74603780eb) * Support comments in ansible-test flat files. (cherry picked from commit 5a3000af19b81c1baf592e970683c7fd0ac0d43f) * Fix incorrect use of subprocess.CalledProcessError (#45890) (cherry picked from commit 24dd87bd0abeb41a8cf167f7f31ed7e8e4255ea3) * Improve ansible-test match error handling. (cherry picked from commit 2056c981ae0fad9289337cb63c8b1b0d5b539368) * Improve error handling for docs-build test. (cherry picked from commit 2148999048179c623a31b0fac3bb02361ec42fe2) * Bug fixes and cleanup for ansible-test. (#45991) * Remove unused imports. * Clean up ConfigParser usage in ansible-test. * Fix bare except statements in ansible-test. * Miscellaneous cleanup from PyCharm inspections. * Enable pylint no-self-use for ansible-test. * Remove obsolete pylint ignores for Python 3.7. * Fix shellcheck issuers under newer shellcheck. * Use newer path for ansible-test. * Fix issues in code-smell tests. (cherry picked from commit ac492476e5389e17b8d401174f18b73e59a7fb06) * Fix integration test library search path. This prevents tests from loading modules outside the source tree, which could result in testing the wrong module if a system-wide install is present, or custom modules exist. (cherry picked from commit d603cd41feaef3d9beaa7f133ded59d6809b4916) * Update default container to version 1.2.0. (cherry picked from commit d478a4c3f6e02b48507070c3d1d63fd158890756) (cherry picked from commit 21c4eb8db50423a8184ded3b04fd81d737a4e0fb) * Fix ansible-test docker python version handling. This removes the old name based version detection behavior and uses versions defined in the docker completion file instead, as the new containers do not follow the old naming scheme. (cherry picked from commit 54937ba7848c3d10b31b85c46e3e8d41c98c5519) * Reduce noise in docs-build test failures. (cherry picked from commit 4085d016178fe4be15a52264fe903fd2932cefc7) * Fix ansible-test encoding issues for exceptions. (cherry picked from commit 0d7a156319f2b9f1786147bb717ec2b0d7bd6091) * Fix ansible-test multi-group smoke test handling. (#46363) * Fix ansible-test smoke tests across groups. * Fix ansible-test list arg defaults. * Fix ansible-test require and exclude delegation. * Fix detection of Windows specific changes. * Add minimal Windows testing for Python 3.7. (cherry picked from commit e53390b3b1afedc475294f25b9c2b847fa63a806) * Use default-test-container version 1.3.0. (cherry picked from commit 6d9be66418452a655b551e0796361273f3c7ac18) * Add file exists check in integration-aliases test. (cherry picked from commit 33a8be9109ff3bf77d21dfa0117238d0f081a0b1) * Improve ansible-test environment checking between tests. (#46459) * Add unified diff output to environment validation. This makes it easier to see where the environment changed. * Compare Python interpreters by version to pip shebangs. This helps expose cases where pip executables use a different Python interpreter than is expected. * Query `pip.__version__` instead of using `pip --version`. This is a much faster way to query the pip version. It also more closely matches how we invoke pip within ansible-test. * Remove redundant environment scan between tests. This reuses the environment scan from the end of the previous test as the basis for comparison during the next test. (cherry picked from commit 0dc7f3878794f6deecfcc642da45c951ca376069) * Add symlinks sanity test. (#46467) * Add symlinks sanity test. * Replace legacy test symlinks with actual content. * Remove dir symlink from template_jinja2_latest. * Update import test to use generated library dir. * Fix copy test symlink setup. (cherry picked from commit e2b60475147204ff5c06de3b4f0e2106ded064ff) * Fix parametrize warning in unit tests. (cherry picked from commit 1a28898a008b7c349bbd7a7604788678bc954e31) * Update MANIFEST.in (#46502) * Update MANIFEST.in: - Remove unnecessary prune. - Include files needed by tests. - Exclude botmeta sanity test. These changes permit sanity tests to pass on sdist output. (cherry picked from commit cbb49f66ecbba1547fe864cb2ff08ddbe0ad074c) * Fix unit tests which modify the source tree. (#45763) * Fix CNOS unit test log usage. * Use temp dir for Galaxy unit tests. * Write to temp files in interfaces_file unit test. * Fix log placement in netapp_e_ldap unit test. (cherry picked from commit 0686450cae86720c804d2f6b6d09fa3abba9dacc) * Fix ansible-test custom docker image traceback. (cherry picked from commit 712ad9ed64084b58058801258087667a6681939d) * ansible-test: Create public key creating Windows targets (#43760) * ansible-test: Create public key creating Windows targets * Changed to always set SSH Key for Windows hosts (cherry picked from commit adc0efe10c5be833b5138e1d8b0d0316f87c5241) * Fix and re-enable sts_assume_role integration tests (#46026) * Fix the STS assume role error message assertion when the role to assume does not exist. (cherry picked from commit 18dc928e28ae35bf9b786c8a48558ff83cc3a6a2) * Fix ACI unit test on Python 3.7.0. The previous logic was only needed for pre-release versions of 3.7. (cherry picked from commit c0bf9815c98c9ec00fc9648ae7a0f561684fc10e) * Remove placeboify from unit tests that are not calling AWS (i.e. creating a recording) (#45754) (cherry picked from commit 2167ce6cb6db57bf066dce83a5a03978a13bf1ef) * Update sanity test ignore entries.
2018-10-13 17:44:11 +00:00
if platform != 'windows':
manage.ssh('rm -rf /tmp/results && cp -a ansible/test/results /tmp/results && chmod -R a+r /tmp/results')
manage.download('/tmp/results', 'test')
finally:
if args.remote_terminate == 'always' or (args.remote_terminate == 'success' and success):
core_ci.stop()
if httptester_id:
docker_rm(args, httptester_id)
def generate_command(args, path, options, exclude, require):
"""
:type args: EnvironmentConfig
:type path: str
:type options: dict[str, int]
:type exclude: list[str]
:type require: list[str]
:rtype: list[str]
"""
options['--color'] = 1
cmd = [path]
cmd += list(filter_options(args, sys.argv[1:], options, exclude, require))
cmd += ['--color', 'yes' if args.color else 'no']
if args.requirements:
cmd += ['--requirements']
if isinstance(args, ShellConfig):
cmd = create_shell_command(cmd)
elif isinstance(args, SanityConfig):
if args.base_branch:
cmd += ['--base-branch', args.base_branch]
return cmd
def filter_options(args, argv, options, exclude, require):
"""
:type args: EnvironmentConfig
:type argv: list[str]
:type options: dict[str, int]
:type exclude: list[str]
:type require: list[str]
:rtype: collections.Iterable[str]
"""
options = options.copy()
options['--requirements'] = 0
options['--truncate'] = 1
options['--redact'] = 0
if isinstance(args, TestConfig):
options.update({
'--changed': 0,
'--tracked': 0,
'--untracked': 0,
'--ignore-committed': 0,
'--ignore-staged': 0,
'--ignore-unstaged': 0,
'--changed-from': 1,
'--changed-path': 1,
'--metadata': 1,
Backport test infra fixes and updates to stable-2.5. (#46992) * Fix unit test parametrize order on Python 3.5. (cherry picked from commit 53b230ca746e8657d6aed09885568f0cf8dbc61e) * Fix ansible-test unit test execution. (#45772) * Fix ansible-test units requirements install. * Run unit tests as unprivileged user under Docker. (cherry picked from commit 379a7f4f5a0491964c7896834f3f326412888585) * Run unit tests in parallel. (#45812) (cherry picked from commit abe8e4c9e8bd9cdca70a7906b15beb57a52393ca) * Minor fixes for unit test delegation. (cherry picked from commit be199cfe90927d4e369597ee3c4b86401454614c) * add support for opening shell on remote Windows host (#43919) * add support for opening shell on remote Windows host * added arg completion and fix sanity check * remove uneeded arg (cherry picked from commit 6ca4ea0c1f20ff23f231bbe14a80fd3eafc87087) * Block network access for unit tests in docker. (cherry picked from commit 99cac99cbc3b49ad9fb39950d881e0f266775320) * Make ansible-test available in the bin directory. (#45876) (cherry picked from commit f3d1f9544ba67785e787ea303f81db74603780eb) * Support comments in ansible-test flat files. (cherry picked from commit 5a3000af19b81c1baf592e970683c7fd0ac0d43f) * Fix incorrect use of subprocess.CalledProcessError (#45890) (cherry picked from commit 24dd87bd0abeb41a8cf167f7f31ed7e8e4255ea3) * Improve ansible-test match error handling. (cherry picked from commit 2056c981ae0fad9289337cb63c8b1b0d5b539368) * Improve error handling for docs-build test. (cherry picked from commit 2148999048179c623a31b0fac3bb02361ec42fe2) * Bug fixes and cleanup for ansible-test. (#45991) * Remove unused imports. * Clean up ConfigParser usage in ansible-test. * Fix bare except statements in ansible-test. * Miscellaneous cleanup from PyCharm inspections. * Enable pylint no-self-use for ansible-test. * Remove obsolete pylint ignores for Python 3.7. * Fix shellcheck issuers under newer shellcheck. * Use newer path for ansible-test. * Fix issues in code-smell tests. (cherry picked from commit ac492476e5389e17b8d401174f18b73e59a7fb06) * Fix integration test library search path. This prevents tests from loading modules outside the source tree, which could result in testing the wrong module if a system-wide install is present, or custom modules exist. (cherry picked from commit d603cd41feaef3d9beaa7f133ded59d6809b4916) * Update default container to version 1.2.0. (cherry picked from commit d478a4c3f6e02b48507070c3d1d63fd158890756) (cherry picked from commit 21c4eb8db50423a8184ded3b04fd81d737a4e0fb) * Fix ansible-test docker python version handling. This removes the old name based version detection behavior and uses versions defined in the docker completion file instead, as the new containers do not follow the old naming scheme. (cherry picked from commit 54937ba7848c3d10b31b85c46e3e8d41c98c5519) * Reduce noise in docs-build test failures. (cherry picked from commit 4085d016178fe4be15a52264fe903fd2932cefc7) * Fix ansible-test encoding issues for exceptions. (cherry picked from commit 0d7a156319f2b9f1786147bb717ec2b0d7bd6091) * Fix ansible-test multi-group smoke test handling. (#46363) * Fix ansible-test smoke tests across groups. * Fix ansible-test list arg defaults. * Fix ansible-test require and exclude delegation. * Fix detection of Windows specific changes. * Add minimal Windows testing for Python 3.7. (cherry picked from commit e53390b3b1afedc475294f25b9c2b847fa63a806) * Use default-test-container version 1.3.0. (cherry picked from commit 6d9be66418452a655b551e0796361273f3c7ac18) * Add file exists check in integration-aliases test. (cherry picked from commit 33a8be9109ff3bf77d21dfa0117238d0f081a0b1) * Improve ansible-test environment checking between tests. (#46459) * Add unified diff output to environment validation. This makes it easier to see where the environment changed. * Compare Python interpreters by version to pip shebangs. This helps expose cases where pip executables use a different Python interpreter than is expected. * Query `pip.__version__` instead of using `pip --version`. This is a much faster way to query the pip version. It also more closely matches how we invoke pip within ansible-test. * Remove redundant environment scan between tests. This reuses the environment scan from the end of the previous test as the basis for comparison during the next test. (cherry picked from commit 0dc7f3878794f6deecfcc642da45c951ca376069) * Add symlinks sanity test. (#46467) * Add symlinks sanity test. * Replace legacy test symlinks with actual content. * Remove dir symlink from template_jinja2_latest. * Update import test to use generated library dir. * Fix copy test symlink setup. (cherry picked from commit e2b60475147204ff5c06de3b4f0e2106ded064ff) * Fix parametrize warning in unit tests. (cherry picked from commit 1a28898a008b7c349bbd7a7604788678bc954e31) * Update MANIFEST.in (#46502) * Update MANIFEST.in: - Remove unnecessary prune. - Include files needed by tests. - Exclude botmeta sanity test. These changes permit sanity tests to pass on sdist output. (cherry picked from commit cbb49f66ecbba1547fe864cb2ff08ddbe0ad074c) * Fix unit tests which modify the source tree. (#45763) * Fix CNOS unit test log usage. * Use temp dir for Galaxy unit tests. * Write to temp files in interfaces_file unit test. * Fix log placement in netapp_e_ldap unit test. (cherry picked from commit 0686450cae86720c804d2f6b6d09fa3abba9dacc) * Fix ansible-test custom docker image traceback. (cherry picked from commit 712ad9ed64084b58058801258087667a6681939d) * ansible-test: Create public key creating Windows targets (#43760) * ansible-test: Create public key creating Windows targets * Changed to always set SSH Key for Windows hosts (cherry picked from commit adc0efe10c5be833b5138e1d8b0d0316f87c5241) * Fix and re-enable sts_assume_role integration tests (#46026) * Fix the STS assume role error message assertion when the role to assume does not exist. (cherry picked from commit 18dc928e28ae35bf9b786c8a48558ff83cc3a6a2) * Fix ACI unit test on Python 3.7.0. The previous logic was only needed for pre-release versions of 3.7. (cherry picked from commit c0bf9815c98c9ec00fc9648ae7a0f561684fc10e) * Remove placeboify from unit tests that are not calling AWS (i.e. creating a recording) (#45754) (cherry picked from commit 2167ce6cb6db57bf066dce83a5a03978a13bf1ef) * Update sanity test ignore entries.
2018-10-13 17:44:11 +00:00
'--exclude': 1,
'--require': 1,
})
elif isinstance(args, SanityConfig):
options.update({
'--base-branch': 1,
})
remaining = 0
for arg in argv:
if not arg.startswith('-') and remaining:
remaining -= 1
continue
remaining = 0
parts = arg.split('=', 1)
key = parts[0]
if key in options:
remaining = options[key] - len(parts) + 1
continue
yield arg
Backport test infra fixes and updates to stable-2.5. (#46992) * Fix unit test parametrize order on Python 3.5. (cherry picked from commit 53b230ca746e8657d6aed09885568f0cf8dbc61e) * Fix ansible-test unit test execution. (#45772) * Fix ansible-test units requirements install. * Run unit tests as unprivileged user under Docker. (cherry picked from commit 379a7f4f5a0491964c7896834f3f326412888585) * Run unit tests in parallel. (#45812) (cherry picked from commit abe8e4c9e8bd9cdca70a7906b15beb57a52393ca) * Minor fixes for unit test delegation. (cherry picked from commit be199cfe90927d4e369597ee3c4b86401454614c) * add support for opening shell on remote Windows host (#43919) * add support for opening shell on remote Windows host * added arg completion and fix sanity check * remove uneeded arg (cherry picked from commit 6ca4ea0c1f20ff23f231bbe14a80fd3eafc87087) * Block network access for unit tests in docker. (cherry picked from commit 99cac99cbc3b49ad9fb39950d881e0f266775320) * Make ansible-test available in the bin directory. (#45876) (cherry picked from commit f3d1f9544ba67785e787ea303f81db74603780eb) * Support comments in ansible-test flat files. (cherry picked from commit 5a3000af19b81c1baf592e970683c7fd0ac0d43f) * Fix incorrect use of subprocess.CalledProcessError (#45890) (cherry picked from commit 24dd87bd0abeb41a8cf167f7f31ed7e8e4255ea3) * Improve ansible-test match error handling. (cherry picked from commit 2056c981ae0fad9289337cb63c8b1b0d5b539368) * Improve error handling for docs-build test. (cherry picked from commit 2148999048179c623a31b0fac3bb02361ec42fe2) * Bug fixes and cleanup for ansible-test. (#45991) * Remove unused imports. * Clean up ConfigParser usage in ansible-test. * Fix bare except statements in ansible-test. * Miscellaneous cleanup from PyCharm inspections. * Enable pylint no-self-use for ansible-test. * Remove obsolete pylint ignores for Python 3.7. * Fix shellcheck issuers under newer shellcheck. * Use newer path for ansible-test. * Fix issues in code-smell tests. (cherry picked from commit ac492476e5389e17b8d401174f18b73e59a7fb06) * Fix integration test library search path. This prevents tests from loading modules outside the source tree, which could result in testing the wrong module if a system-wide install is present, or custom modules exist. (cherry picked from commit d603cd41feaef3d9beaa7f133ded59d6809b4916) * Update default container to version 1.2.0. (cherry picked from commit d478a4c3f6e02b48507070c3d1d63fd158890756) (cherry picked from commit 21c4eb8db50423a8184ded3b04fd81d737a4e0fb) * Fix ansible-test docker python version handling. This removes the old name based version detection behavior and uses versions defined in the docker completion file instead, as the new containers do not follow the old naming scheme. (cherry picked from commit 54937ba7848c3d10b31b85c46e3e8d41c98c5519) * Reduce noise in docs-build test failures. (cherry picked from commit 4085d016178fe4be15a52264fe903fd2932cefc7) * Fix ansible-test encoding issues for exceptions. (cherry picked from commit 0d7a156319f2b9f1786147bb717ec2b0d7bd6091) * Fix ansible-test multi-group smoke test handling. (#46363) * Fix ansible-test smoke tests across groups. * Fix ansible-test list arg defaults. * Fix ansible-test require and exclude delegation. * Fix detection of Windows specific changes. * Add minimal Windows testing for Python 3.7. (cherry picked from commit e53390b3b1afedc475294f25b9c2b847fa63a806) * Use default-test-container version 1.3.0. (cherry picked from commit 6d9be66418452a655b551e0796361273f3c7ac18) * Add file exists check in integration-aliases test. (cherry picked from commit 33a8be9109ff3bf77d21dfa0117238d0f081a0b1) * Improve ansible-test environment checking between tests. (#46459) * Add unified diff output to environment validation. This makes it easier to see where the environment changed. * Compare Python interpreters by version to pip shebangs. This helps expose cases where pip executables use a different Python interpreter than is expected. * Query `pip.__version__` instead of using `pip --version`. This is a much faster way to query the pip version. It also more closely matches how we invoke pip within ansible-test. * Remove redundant environment scan between tests. This reuses the environment scan from the end of the previous test as the basis for comparison during the next test. (cherry picked from commit 0dc7f3878794f6deecfcc642da45c951ca376069) * Add symlinks sanity test. (#46467) * Add symlinks sanity test. * Replace legacy test symlinks with actual content. * Remove dir symlink from template_jinja2_latest. * Update import test to use generated library dir. * Fix copy test symlink setup. (cherry picked from commit e2b60475147204ff5c06de3b4f0e2106ded064ff) * Fix parametrize warning in unit tests. (cherry picked from commit 1a28898a008b7c349bbd7a7604788678bc954e31) * Update MANIFEST.in (#46502) * Update MANIFEST.in: - Remove unnecessary prune. - Include files needed by tests. - Exclude botmeta sanity test. These changes permit sanity tests to pass on sdist output. (cherry picked from commit cbb49f66ecbba1547fe864cb2ff08ddbe0ad074c) * Fix unit tests which modify the source tree. (#45763) * Fix CNOS unit test log usage. * Use temp dir for Galaxy unit tests. * Write to temp files in interfaces_file unit test. * Fix log placement in netapp_e_ldap unit test. (cherry picked from commit 0686450cae86720c804d2f6b6d09fa3abba9dacc) * Fix ansible-test custom docker image traceback. (cherry picked from commit 712ad9ed64084b58058801258087667a6681939d) * ansible-test: Create public key creating Windows targets (#43760) * ansible-test: Create public key creating Windows targets * Changed to always set SSH Key for Windows hosts (cherry picked from commit adc0efe10c5be833b5138e1d8b0d0316f87c5241) * Fix and re-enable sts_assume_role integration tests (#46026) * Fix the STS assume role error message assertion when the role to assume does not exist. (cherry picked from commit 18dc928e28ae35bf9b786c8a48558ff83cc3a6a2) * Fix ACI unit test on Python 3.7.0. The previous logic was only needed for pre-release versions of 3.7. (cherry picked from commit c0bf9815c98c9ec00fc9648ae7a0f561684fc10e) * Remove placeboify from unit tests that are not calling AWS (i.e. creating a recording) (#45754) (cherry picked from commit 2167ce6cb6db57bf066dce83a5a03978a13bf1ef) * Update sanity test ignore entries.
2018-10-13 17:44:11 +00:00
for arg in args.delegate_args:
yield arg
for target in exclude:
yield '--exclude'
yield target
for target in require:
yield '--require'
yield target
if isinstance(args, TestConfig):
if args.metadata_path:
yield '--metadata'
yield args.metadata_path
yield '--truncate'
yield '%d' % args.truncate
if args.redact:
yield '--redact'