diff options
| author | Matt Clay <matt@mystile.com> | 2019-08-28 08:40:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-28 08:40:06 +0200 |
| commit | f5d829392a17e20d0ba02c30e5a377a43cf70cfd (patch) | |
| tree | 6dba1bdf24e10806d8713bfc18b1c7357b4a8ed7 /test/lib/ansible_test/_internal/config.py | |
| parent | Adding snapshot module (#61418) (diff) | |
| download | ansible-f5d829392a17e20d0ba02c30e5a377a43cf70cfd.tar.xz ansible-f5d829392a17e20d0ba02c30e5a377a43cf70cfd.zip | |
Overhaul ansible-test test path handling. (#61416)
* Remove .keep files from test/results/ dirs.
* Remove classification of test/results/ dir.
* Add results_relative to data context.
* Use variables in delegation paths.
* Standardize file writing and results paths.
* Fix issues reported by PyCharm.
* Clean up invocation of coverage command.
It now runs through the injector.
* Hack to allow intercept_command in cover.py.
* Simplify git ignore for test results.
* Use test result tmp dir instead of cache dir.
* Remove old .pytest_cache reference.
* Fix unit test docker delegation.
* Show HTML report link.
* Clean up more results references.
* Move import sanity test output to .tmp dir.
* Exclude test results dir from coverage.
* Fix import sanity test lib paths.
* Fix hard-coded import test paths.
* Fix most hard-coded integration test paths.
* Fix PyCharm warnings.
* Fix import placement.
* Fix integration test dir path.
* Fix Shippable scripts.
* Fix Shippable matrix check.
* Overhaul key pair management.
Diffstat (limited to 'test/lib/ansible_test/_internal/config.py')
| -rw-r--r-- | test/lib/ansible_test/_internal/config.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/lib/ansible_test/_internal/config.py b/test/lib/ansible_test/_internal/config.py index 024b289094..6609648ce7 100644 --- a/test/lib/ansible_test/_internal/config.py +++ b/test/lib/ansible_test/_internal/config.py @@ -14,7 +14,6 @@ from .util import ( generate_pip_command, get_docker_completion, ApplicationError, - INTEGRATION_DIR_RELATIVE, ) from .util_common import ( @@ -247,7 +246,7 @@ class IntegrationConfig(TestConfig): def get_ansible_config(self): # type: () -> str """Return the path to the Ansible config for the given config.""" - ansible_config_relative_path = os.path.join(INTEGRATION_DIR_RELATIVE, '%s.cfg' % self.command) + ansible_config_relative_path = os.path.join(data_context().content.integration_path, '%s.cfg' % self.command) ansible_config_path = os.path.join(data_context().content.root, ansible_config_relative_path) if not os.path.exists(ansible_config_path): @@ -327,6 +326,7 @@ class CoverageConfig(EnvironmentConfig): self.group_by = frozenset(args.group_by) if 'group_by' in args and args.group_by else set() # type: t.FrozenSet[str] self.all = args.all if 'all' in args else False # type: bool self.stub = args.stub if 'stub' in args else False # type: bool + self.coverage = False # temporary work-around to support intercept_command in cover.py class CoverageReportConfig(CoverageConfig): |