wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Multiple ansible-test fixes. (#38247)

Browse source 
* Add ansible-test integration --allow-root option.
* Fix destructive target override.
* Fix bad type hint SanityResult -> TestResult.
* Fix skip/python3 filtering with --docker option.
This commit is contained in:
Matt Clay 2018-04-03 18:53:53 -07:00 committed by GitHub
parent f37a44430f
commit a5cbc0a2c8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 32 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
test/runner/lib/config.py
View file

@ -160,7 +160,8 @@ class IntegrationConfig(TestConfig):
self.start_at = args.start_at # type: str
self.start_at_task = args.start_at_task # type: str
self.allow_destructive = args.allow_destructive if 'allow_destructive' in args else False # type: bool
self.allow_destructive = args.allow_destructive # type: bool
self.allow_root = args.allow_root # type: bool
self.retry_on_error = args.retry_on_error # type: bool
self.continue_on_error = args.continue_on_error # type: bool
self.debug_strategy = args.debug_strategy # type: bool

22
test/runner/lib/executor.py
View file

@ -1183,23 +1183,23 @@ def get_integration_local_filter(args, targets):
"""
exclude = []
if os.getuid() != 0:
if not args.allow_root and os.getuid() != 0:
skip = 'needs/root/'
skipped = [target.name for target in targets if skip in target.aliases]
if skipped:
exclude.append(skip)
display.warning('Excluding tests marked "%s" which require running as root: %s'
display.warning('Excluding tests marked "%s" which require --allow-root or running as root: %s'
% (skip.rstrip('/'), ', '.join(skipped)))
# consider explicit testing of destructive as though --allow-destructive was given
include_destructive = any(target.startswith('destructive/') for target in args.include)
override_destructive = set(target for target in args.include if target.startswith('destructive/'))
if not args.allow_destructive and not include_destructive:
if not args.allow_destructive:
skip = 'destructive/'
skipped = [target.name for target in targets if skip in target.aliases]
override = [target.name for target in targets if override_destructive & set(target.aliases)]
skipped = [target.name for target in targets if skip in target.aliases and target.name not in override]
if skipped:
exclude.append(skip)
display.warning('Excluding tests marked "%s" which require --allow-destructive to run locally: %s'
exclude.extend(skipped)
display.warning('Excluding tests marked "%s" which require --allow-destructive or prefixing with "destructive/" to run locally: %s'
% (skip.rstrip('/'), ', '.join(skipped)))
if args.python_version.startswith('3'):
@ -1233,12 +1233,14 @@ def get_integration_docker_filter(args, targets):
display.warning('Excluding tests marked "%s" which require --docker-privileged to run under docker: %s'
% (skip.rstrip('/'), ', '.join(skipped)))
docker_image = args.docker.split('@')[0] # strip SHA for proper tag comparison
python_version = 2 # images are expected to default to python 2 unless otherwise specified
if args.docker.endswith('py3'):
if docker_image.endswith('py3'):
python_version = 3 # docker images ending in 'py3' are expected to default to python 3
if args.docker.endswith(':default'):
if docker_image.endswith(':default'):
python_version = 3 # docker images tagged 'default' are expected to default to python 3
if args.python: # specifying a numeric --python option overrides the default python

6
test/runner/lib/sanity/__init__.py
View file

@ -220,7 +220,7 @@ class SanityCodeSmellTest(SanityTest):
"""
:type args: SanityConfig
:type targets: SanityTargets
:rtype: SanityResult
:rtype: TestResult
"""
if self.path.endswith('.py'):
cmd = [args.python_executable, self.path]
@ -327,7 +327,7 @@ class SanitySingleVersion(SanityFunc):
"""
:type args: SanityConfig
:type targets: SanityTargets
:rtype: SanityResult
:rtype: TestResult
"""
pass
@ -340,7 +340,7 @@ class SanityMultipleVersion(SanityFunc):
:type args: SanityConfig
:type targets: SanityTargets
:type python_version: str
:rtype: SanityResult
:rtype: TestResult
"""
pass

2
test/runner/lib/sanity/ansible_doc.py
View file

@ -33,7 +33,7 @@ class AnsibleDocTest(SanityMultipleVersion):
:type args: SanityConfig
:type targets: SanityTargets
:type python_version: str
:rtype: SanityResult
:rtype: TestResult
"""
with open('test/sanity/ansible-doc/skip.txt', 'r') as skip_fd:
skip_modules = set(skip_fd.read().splitlines())

2
test/runner/lib/sanity/compile.py
View file

@ -35,7 +35,7 @@ class CompileTest(SanityMultipleVersion):
:type args: SanityConfig
:type targets: SanityTargets
:type python_version: str
:rtype: SanityResult
:rtype: TestResult
"""
# optional list of regex patterns to exclude from tests
skip_file = 'test/sanity/compile/python%s-skip.txt' % python_version

2
test/runner/lib/sanity/import.py
View file

@ -41,7 +41,7 @@ class ImportTest(SanityMultipleVersion):
:type args: SanityConfig
:type targets: SanityTargets
:type python_version: str
:rtype: SanityResult
:rtype: TestResult
"""
with open('test/sanity/import/skip.txt', 'r') as skip_fd:
skip_paths = skip_fd.read().splitlines()

2
test/runner/lib/sanity/pep8.py
View file

@ -35,7 +35,7 @@ class Pep8Test(SanitySingleVersion):
"""
:type args: SanityConfig
:type targets: SanityTargets
:rtype: SanityResult
:rtype: TestResult
"""
with open(PEP8_SKIP_PATH, 'r') as skip_fd:
skip_paths = skip_fd.read().splitlines()

2
test/runner/lib/sanity/pslint.py
View file

@ -39,7 +39,7 @@ class PslintTest(SanitySingleVersion):
"""
:type args: SanityConfig
:type targets: SanityTargets
:rtype: SanityResult
:rtype: TestResult
"""
with open(PSLINT_SKIP_PATH, 'r') as skip_fd:
skip_paths = skip_fd.read().splitlines()

2
test/runner/lib/sanity/pylint.py
View file

@ -63,7 +63,7 @@ class PylintTest(SanitySingleVersion):
"""
:type args: SanityConfig
:type targets: SanityTargets
:rtype: SanityResult
:rtype: TestResult
"""
if args.python_version in UNSUPPORTED_PYTHON_VERSIONS:
display.warning('Skipping pylint on unsupported Python version %s.' % args.python_version)

2
test/runner/lib/sanity/rstcheck.py
View file

@ -34,7 +34,7 @@ class RstcheckTest(SanitySingleVersion):
"""
:type args: SanityConfig
:type targets: SanityTargets
:rtype: SanityResult
:rtype: TestResult
"""
if args.python_version in UNSUPPORTED_PYTHON_VERSIONS:
display.warning('Skipping rstcheck on unsupported Python version %s.' % args.python_version)

2
test/runner/lib/sanity/sanity_docs.py
View file

@ -23,7 +23,7 @@ class SanityDocsTest(SanitySingleVersion):
"""
:type args: SanityConfig
:type targets: SanityTargets
:rtype: SanityResult
:rtype: TestResult
"""
sanity_dir = 'docs/docsite/rst/dev_guide/testing/sanity'
sanity_docs = set(part[0] for part in (os.path.splitext(name) for name in os.listdir(sanity_dir)) if part[1] == '.rst')

2
test/runner/lib/sanity/shellcheck.py
View file

@ -32,7 +32,7 @@ class ShellcheckTest(SanitySingleVersion):
"""
:type args: SanityConfig
:type targets: SanityTargets
:rtype: SanityResult
:rtype: TestResult
"""
with open('test/sanity/shellcheck/skip.txt', 'r') as skip_fd:
skip_paths = set(skip_fd.read().splitlines())

2
test/runner/lib/sanity/validate_modules.py
View file

@ -42,7 +42,7 @@ class ValidateModulesTest(SanitySingleVersion):
"""
:type args: SanityConfig
:type targets: SanityTargets
:rtype: SanityResult
:rtype: TestResult
"""
with open(VALIDATE_SKIP_PATH, 'r') as skip_fd:
skip_paths = skip_fd.read().splitlines()

2
test/runner/lib/sanity/yamllint.py
View file

@ -29,7 +29,7 @@ class YamllintTest(SanitySingleVersion):
"""
:type args: SanityConfig
:type targets: SanityTargets
:rtype: SanityResult
:rtype: TestResult
"""
paths = [
[i.path for i in targets.include if os.path.splitext(i.path)[1] in ('.yml', '.yaml')],

4
test/runner/test.py
View file

@ -225,6 +225,10 @@ def parse_args():
action='store_true',
help='allow destructive tests (--local and --tox only)')
integration.add_argument('--allow-root',
action='store_true',
help='allow tests requiring root when not root')
integration.add_argument('--retry-on-error',
action='store_true',
help='retry failed test with increased verbosity')