diff --git a/Makefile b/Makefile index 6e913e9859..596df5464b 100644 --- a/Makefile +++ b/Makefile @@ -20,7 +20,7 @@ COLLECTION_SANITY_ARGS ?= --docker # collection unit testing directories COLLECTION_TEST_DIRS ?= awx_collection/test/awx # pytest added args to collect coverage -COVERAGE_ARGS ?= --cov=awx --cov-report=xml --junitxml=reports/junit.xml --no-cov-on-fail +COVERAGE_ARGS ?= --cov=awx --cov-report=xml --junitxml=reports/junit.xml # pytest test directories TEST_DIRS ?= awx/main/tests/unit awx/main/tests/functional awx/conf/tests # pytest args to run tests in parallel diff --git a/awx/main/tests/data/inventory/plugins/controller/env.json b/awx/main/tests/data/inventory/plugins/controller/env.json index 97f9605b72..8a13483b04 100644 --- a/awx/main/tests/data/inventory/plugins/controller/env.json +++ b/awx/main/tests/data/inventory/plugins/controller/env.json @@ -8,5 +8,12 @@ "CONTROLLER_PASSWORD": "fooo", "CONTROLLER_USERNAME": "fooo", "CONTROLLER_OAUTH_TOKEN": "", - "CONTROLLER_VERIFY_SSL": "False" + "CONTROLLER_VERIFY_SSL": "False", + "AAP_HOSTNAME": "https://foo.invalid", + "AAP_PASSWORD": "fooo", + "AAP_USERNAME": "fooo", + "AAP_VALIDATE_CERTS": "False", + "CONTROLLER_REQUEST_TIMEOUT": "fooo", + "AAP_REQUEST_TIMEOUT": "fooo", + "AAP_TOKEN": "" }