mirror of
https://github.com/ansible-collections/community.general.git
synced 2025-07-22 12:50:22 -07:00
Convert ansible-test compile into a sanity test.
This commit is contained in:
Matt Clay
parent
0ce8d389a4
commit
7abdab6c9e
13 changed files with 166 additions and 198 deletions
|
|
@ -44,7 +44,6 @@ def categorize_changes(args, paths, verbose_command=None):
|
|||
|
||||
commands = {
|
||||
'sanity': set(),
|
||||
'compile': set(),
|
||||
'units': set(),
|
||||
'integration': set(),
|
||||
'windows-integration': set(),
|
||||
|
|
@ -128,7 +127,6 @@ class PathMapper(object):
|
|||
self.sanity_targets = list(walk_sanity_targets())
|
||||
self.powershell_targets = [t for t in self.sanity_targets if os.path.splitext(t.path)[1] == '.ps1']
|
||||
|
||||
self.compile_paths = set(t.path for t in self.compile_targets)
|
||||
self.units_modules = set(t.module for t in self.units_targets if t.module)
|
||||
self.units_paths = set(a for t in self.units_targets for a in t.aliases)
|
||||
self.sanity_paths = set(t.path for t in self.sanity_targets)
|
||||
|
|
@ -228,10 +226,6 @@ class PathMapper(object):
|
|||
if result is None:
|
||||
return None
|
||||
|
||||
# compile path if eligible
|
||||
if path in self.compile_paths:
|
||||
result['compile'] = path
|
||||
|
||||
# run sanity on path unless result specified otherwise
|
||||
if path in self.sanity_paths and 'sanity' not in result:
|
||||
result['sanity'] = path
|
||||
|
|
@ -393,11 +387,6 @@ class PathMapper(object):
|
|||
if path.startswith('test/cache/'):
|
||||
return minimal
|
||||
|
||||
if path.startswith('test/compile/'):
|
||||
return {
|
||||
'compile': 'all',
|
||||
}
|
||||
|
||||
if path.startswith('test/results/'):
|
||||
return minimal
|
||||
|
||||
|
|
@ -544,7 +533,32 @@ class PathMapper(object):
|
|||
|
||||
return all_tests(self.args) # test infrastructure, run all tests
|
||||
|
||||
if path.startswith('test/utils/shippable/tools/'):
|
||||
return minimal # not used by tests
|
||||
|
||||
if path.startswith('test/utils/shippable/'):
|
||||
if dirname == 'test/utils/shippable':
|
||||
test_map = {
|
||||
'cloud.sh': 'integration:cloud/',
|
||||
'freebsd.sh': 'integration:all',
|
||||
'linux.sh': 'integration:all',
|
||||
'network.sh': 'network-integration:all',
|
||||
'osx.sh': 'integration:all',
|
||||
'rhel.sh': 'integration:all',
|
||||
'sanity.sh': 'sanity:all',
|
||||
'units.sh': 'units:all',
|
||||
'windows.sh': 'windows-integration:all',
|
||||
}
|
||||
|
||||
test_match = test_map.get(filename)
|
||||
|
||||
if test_match:
|
||||
test_command, test_target = test_match.split(':')
|
||||
|
||||
return {
|
||||
test_command: test_target,
|
||||
}
|
||||
|
||||
return all_tests(self.args) # test infrastructure, run all tests
|
||||
|
||||
if path.startswith('test/utils/'):
|
||||
|
|
@ -602,7 +616,6 @@ def all_tests(args, force=False):
|
|||
|
||||
return {
|
||||
'sanity': 'all',
|
||||
'compile': 'all',
|
||||
'units': 'all',
|
||||
'integration': integration_all_target,
|
||||
'windows-integration': integration_all_target,
|
||||
|
|
|
|||
|
|
@ -206,15 +206,6 @@ class UnitsConfig(TestConfig):
|
|||
self.collect_only = args.collect_only # type: bool
|
||||
|
||||
|
||||
class CompileConfig(TestConfig):
|
||||
"""Configuration for the compile command."""
|
||||
def __init__(self, args):
|
||||
"""
|
||||
:type args: any
|
||||
"""
|
||||
super(CompileConfig, self).__init__(args, 'compile')
|
||||
|
||||
|
||||
class CoverageConfig(EnvironmentConfig):
|
||||
"""Configuration for the coverage command."""
|
||||
def __init__(self, args):
|
||||
|
|
|
|||
|
|
@ -63,7 +63,6 @@ from lib.target import (
|
|||
walk_network_integration_targets,
|
||||
walk_windows_integration_targets,
|
||||
walk_units_targets,
|
||||
walk_compile_targets,
|
||||
)
|
||||
|
||||
from lib.changes import (
|
||||
|
|
@ -82,7 +81,6 @@ from lib.classification import (
|
|||
from lib.config import (
|
||||
TestConfig,
|
||||
EnvironmentConfig,
|
||||
CompileConfig,
|
||||
IntegrationConfig,
|
||||
NetworkIntegrationConfig,
|
||||
PosixIntegrationConfig,
|
||||
|
|
@ -91,13 +89,6 @@ from lib.config import (
|
|||
WindowsIntegrationConfig,
|
||||
)
|
||||
|
||||
from lib.test import (
|
||||
TestMessage,
|
||||
TestSuccess,
|
||||
TestFailure,
|
||||
TestSkipped,
|
||||
)
|
||||
|
||||
SUPPORTED_PYTHON_VERSIONS = (
|
||||
'2.6',
|
||||
'2.7',
|
||||
|
|
@ -106,8 +97,6 @@ SUPPORTED_PYTHON_VERSIONS = (
|
|||
'3.7',
|
||||
)
|
||||
|
||||
COMPILE_PYTHON_VERSIONS = SUPPORTED_PYTHON_VERSIONS
|
||||
|
||||
|
||||
def check_startup():
|
||||
"""Checks to perform at startup before running commands."""
|
||||
|
|
@ -1024,114 +1013,6 @@ def command_units(args):
|
|||
raise
|
||||
|
||||
|
||||
def command_compile(args):
|
||||
"""
|
||||
:type args: CompileConfig
|
||||
"""
|
||||
changes = get_changes_filter(args)
|
||||
require = (args.require or []) + changes
|
||||
include, exclude = walk_external_targets(walk_compile_targets(), args.include, args.exclude, require)
|
||||
|
||||
if not include:
|
||||
raise AllTargetsSkipped()
|
||||
|
||||
if args.delegate:
|
||||
raise Delegate(require=changes)
|
||||
|
||||
install_command_requirements(args)
|
||||
|
||||
total = 0
|
||||
failed = []
|
||||
|
||||
for version in COMPILE_PYTHON_VERSIONS:
|
||||
# run all versions unless version given, in which case run only that version
|
||||
if args.python and version != args.python_version:
|
||||
continue
|
||||
|
||||
display.info('Compile with Python %s' % version)
|
||||
|
||||
result = compile_version(args, version, include, exclude)
|
||||
result.write(args)
|
||||
|
||||
total += 1
|
||||
|
||||
if isinstance(result, TestFailure):
|
||||
failed.append('compile --python %s' % version)
|
||||
|
||||
if failed:
|
||||
message = 'The %d compile test(s) listed below (out of %d) failed. See error output above for details.\n%s' % (
|
||||
len(failed), total, '\n'.join(failed))
|
||||
|
||||
if args.failure_ok:
|
||||
display.error(message)
|
||||
else:
|
||||
raise ApplicationError(message)
|
||||
|
||||
|
||||
def compile_version(args, python_version, include, exclude):
|
||||
"""
|
||||
:type args: CompileConfig
|
||||
:type python_version: str
|
||||
:type include: tuple[CompletionTarget]
|
||||
:type exclude: tuple[CompletionTarget]
|
||||
:rtype: TestResult
|
||||
"""
|
||||
command = 'compile'
|
||||
test = ''
|
||||
|
||||
# optional list of regex patterns to exclude from tests
|
||||
skip_file = 'test/compile/python%s-skip.txt' % python_version
|
||||
|
||||
if os.path.exists(skip_file):
|
||||
with open(skip_file, 'r') as skip_fd:
|
||||
skip_paths = skip_fd.read().splitlines()
|
||||
else:
|
||||
skip_paths = []
|
||||
|
||||
# augment file exclusions
|
||||
skip_paths += [e.path for e in exclude]
|
||||
|
||||
skip_paths = sorted(skip_paths)
|
||||
|
||||
python = 'python%s' % python_version
|
||||
cmd = [python, 'test/compile/compile.py']
|
||||
|
||||
if skip_paths:
|
||||
cmd += ['-x', '|'.join(skip_paths)]
|
||||
|
||||
cmd += [target.path if target.path == '.' else './%s' % target.path for target in include]
|
||||
|
||||
try:
|
||||
stdout, stderr = run_command(args, cmd, capture=True)
|
||||
status = 0
|
||||
except SubprocessError as ex:
|
||||
stdout = ex.stdout
|
||||
stderr = ex.stderr
|
||||
status = ex.status
|
||||
|
||||
if stderr:
|
||||
raise SubprocessError(cmd=cmd, status=status, stderr=stderr, stdout=stdout)
|
||||
|
||||
if args.explain:
|
||||
return TestSkipped(command, test, python_version=python_version)
|
||||
|
||||
pattern = r'^(?P<path>[^:]*):(?P<line>[0-9]+):(?P<column>[0-9]+): (?P<message>.*)$'
|
||||
|
||||
results = [re.search(pattern, line).groupdict() for line in stdout.splitlines()]
|
||||
|
||||
results = [TestMessage(
|
||||
message=r['message'],
|
||||
path=r['path'].replace('./', ''),
|
||||
line=int(r['line']),
|
||||
column=int(r['column']),
|
||||
) for r in results]
|
||||
|
||||
if results:
|
||||
return TestFailure(command, test, messages=results, python_version=python_version)
|
||||
|
||||
return TestSuccess(command, test, python_version=python_version)
|
||||
|
||||
|
||||
def get_changes_filter(args):
|
||||
"""
|
||||
:type args: TestConfig
|
||||
|
|
|
|||
98
test/runner/lib/sanity/compile.py
Normal file
98
test/runner/lib/sanity/compile.py
Normal file
|
|
@ -0,0 +1,98 @@
|
|||
"""Sanity test for proper python syntax."""
|
||||
from __future__ import absolute_import, print_function
|
||||
|
||||
import os
|
||||
import re
|
||||
|
||||
from lib.sanity import (
|
||||
SanityMultipleVersion,
|
||||
SanityMessage,
|
||||
SanityFailure,
|
||||
SanitySuccess,
|
||||
SanitySkipped,
|
||||
)
|
||||
|
||||
from lib.util import (
|
||||
SubprocessError,
|
||||
run_command,
|
||||
)
|
||||
|
||||
from lib.config import (
|
||||
SanityConfig,
|
||||
)
|
||||
|
||||
from lib.test import (
|
||||
calculate_best_confidence,
|
||||
)
|
||||
|
||||
|
||||
class CompileTest(SanityMultipleVersion):
|
||||
"""Sanity test for proper python syntax."""
|
||||
def test(self, args, targets, python_version):
|
||||
"""
|
||||
:type args: SanityConfig
|
||||
:type targets: SanityTargets
|
||||
:type python_version: str
|
||||
:rtype: SanityResult
|
||||
"""
|
||||
# optional list of regex patterns to exclude from tests
|
||||
skip_file = 'test/sanity/compile/python%s-skip.txt' % python_version
|
||||
|
||||
if os.path.exists(skip_file):
|
||||
with open(skip_file, 'r') as skip_fd:
|
||||
skip_paths = skip_fd.read().splitlines()
|
||||
else:
|
||||
skip_paths = []
|
||||
|
||||
paths = sorted(i.path for i in targets.include if (os.path.splitext(i.path)[1] == '.py' or i.path.startswith('bin/')) and i.path not in skip_paths)
|
||||
|
||||
if not paths:
|
||||
return SanitySkipped(self.name, python_version=python_version)
|
||||
|
||||
cmd = ['python%s' % python_version, 'test/sanity/compile/compile.py'] + paths
|
||||
|
||||
try:
|
||||
stdout, stderr = run_command(args, cmd, capture=True)
|
||||
status = 0
|
||||
except SubprocessError as ex:
|
||||
stdout = ex.stdout
|
||||
stderr = ex.stderr
|
||||
status = ex.status
|
||||
|
||||
if stderr:
|
||||
raise SubprocessError(cmd=cmd, status=status, stderr=stderr, stdout=stdout)
|
||||
|
||||
if args.explain:
|
||||
return SanitySuccess(self.name, python_version=python_version)
|
||||
|
||||
pattern = r'^(?P<path>[^:]*):(?P<line>[0-9]+):(?P<column>[0-9]+): (?P<message>.*)$'
|
||||
|
||||
results = [re.search(pattern, line).groupdict() for line in stdout.splitlines()]
|
||||
|
||||
results = [SanityMessage(
|
||||
message=r['message'],
|
||||
path=r['path'].replace('./', ''),
|
||||
line=int(r['line']),
|
||||
column=int(r['column']),
|
||||
) for r in results]
|
||||
|
||||
line = 0
|
||||
|
||||
for path in skip_paths:
|
||||
line += 1
|
||||
|
||||
if not os.path.exists(path):
|
||||
# Keep files out of the list which no longer exist in the repo.
|
||||
results.append(SanityMessage(
|
||||
code='A101',
|
||||
message='Remove "%s" since it does not exist' % path,
|
||||
path=skip_file,
|
||||
line=line,
|
||||
column=1,
|
||||
confidence=calculate_best_confidence(((skip_file, line), (path, 0)), args.metadata) if args.metadata.changes else None,
|
||||
))
|
||||
|
||||
if results:
|
||||
return SanityFailure(self.name, messages=results, python_version=python_version)
|
||||
|
||||
return SanitySuccess(self.name, python_version=python_version)
|
||||
Loading…
Add table
Add a link
Reference in a new issue