From 79021df2e4beefc06fbd95d498f9820fdae6ccea Mon Sep 17 00:00:00 2001 From: Matt Clay Date: Mon, 2 Nov 2020 15:09:16 -0800 Subject: [PATCH] Restore ansible-test coverage config. Reverts a portion of the changes made in https://github.com/ansible/ansible/pull/70028 --- lib/ansible/config/base.yml | 10 ++-------- test/lib/ansible_test/_internal/util_common.py | 2 +- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/lib/ansible/config/base.yml b/lib/ansible/config/base.yml index a3026be2eaf..f8801f1c027 100644 --- a/lib/ansible/config/base.yml +++ b/lib/ansible/config/base.yml @@ -406,14 +406,8 @@ COVERAGE_REMOTE_PATHS: - This is for internal use only. default: '*' env: - - name: _ANSIBLE_COVERAGE_REMOTE_WHITELIST - deprecated: - why: Normalizing names to new standard. - version: "2.15" - alternatives: '_ANSIBLE_COVERAGE_REMOTE_PATHS' - - name: '_ANSIBLE_COVERAGE_REMOTE_PATHS' - version_added: '2.11' - type: pathlist + - {name: _ANSIBLE_COVERAGE_REMOTE_PATH_FILTER} + type: str version_added: '2.9' ACTION_WARNINGS: name: Toggle action warnings diff --git a/test/lib/ansible_test/_internal/util_common.py b/test/lib/ansible_test/_internal/util_common.py index 6f717489253..0f3ae62767a 100644 --- a/test/lib/ansible_test/_internal/util_common.py +++ b/test/lib/ansible_test/_internal/util_common.py @@ -394,7 +394,7 @@ def get_coverage_environment(args, target_name, version, temp_path, module_cover # is responsible for adding '={language version}=coverage.{hostname}.{pid}.{id}' env['_ANSIBLE_COVERAGE_REMOTE_OUTPUT'] = os.path.join(remote_temp_path, '%s=%s=%s' % ( args.command, target_name, args.coverage_label or 'remote')) - env['_ANSIBLE_COVERAGE_REMOTE_PATHS'] = os.path.join(data_context().content.root, '*') + env['_ANSIBLE_COVERAGE_REMOTE_PATH_FILTER'] = os.path.join(data_context().content.root, '*') return env