From 6b30efa454916341d466778aa358a902f227e401 Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Mon, 2 Nov 2020 17:26:25 +0100 Subject: [PATCH] Fix fallout from #70028. --- test/integration/targets/collections/runme.sh | 2 +- test/lib/ansible_test/_internal/executor.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/integration/targets/collections/runme.sh b/test/integration/targets/collections/runme.sh index 61fc43f16cf..a0359e2183f 100755 --- a/test/integration/targets/collections/runme.sh +++ b/test/integration/targets/collections/runme.sh @@ -30,7 +30,7 @@ ANSIBLE_CALLBACKS_ENABLED=charlie.gomez.notme ansible localhost -m debug 2>&1 | unset ANSIBLE_LOAD_CALLBACK_PLUGINS # adhoc normally shouldn't load non-default plugins- let's be sure -output=$(ANSIBLE_CALLBACK_ENABLED=testns.testcoll.usercallback ansible localhost -m debug) +output=$(ANSIBLE_CALLBACKS_ENABLED=testns.testcoll.usercallback ansible localhost -m debug) if [[ "${output}" =~ "usercallback says ok" ]]; then echo fail; exit 1; fi echo "--- validating docs" diff --git a/test/lib/ansible_test/_internal/executor.py b/test/lib/ansible_test/_internal/executor.py index 529d33f0c8f..026d0040f4d 100644 --- a/test/lib/ansible_test/_internal/executor.py +++ b/test/lib/ansible_test/_internal/executor.py @@ -1434,7 +1434,7 @@ def integration_environment(args, target, test_dir, inventory_path, ansible_conf integration = dict( JUNIT_OUTPUT_DIR=ResultType.JUNIT.path, - ANSIBLE_CALLBACK_ENABLED=','.join(sorted(set(callback_plugins))), + ANSIBLE_CALLBACKS_ENABLED=','.join(sorted(set(callback_plugins))), ANSIBLE_TEST_CI=args.metadata.ci_provider or get_ci_provider().code, ANSIBLE_TEST_COVERAGE='check' if args.coverage_check else ('yes' if args.coverage else ''), OUTPUT_DIR=test_dir,