Merge pull request #50735 from mattclay/callback-inv

Move callback_default test inventory into test.

test/integration/inventory

@@ -75,6 +75,3 @@ localhost ansible_ssh_host=127.0.0.1 ansible_connection=local
 
 [azure]
 localhost ansible_ssh_host=127.0.0.1 ansible_connection=local
-
-[nonexistent]
-testhost5 ansible_host=169.254.199.200

test/integration/targets/callback_default/aliases

@@ -1 +1,2 @@
 shippable/posix/group3
+needs/ssh

test/integration/targets/callback_default/callback_default.out.default.stderr

@@ -1,2 +1,2 @@
-+ ansible-playbook -i ../../inventory test.yml
++ ansible-playbook -i inventory test.yml
 ++ set +x

test/integration/targets/callback_default/callback_default.out.failed_to_stderr.stderr

@@ -1,3 +1,3 @@
-+ ansible-playbook -i ../../inventory test.yml
++ ansible-playbook -i inventory test.yml
 ++ set +x
 fatal: [testhost]: FAILED! => {"changed": false, "msg": "no reason"}

test/integration/targets/callback_default/callback_default.out.hide_ok.stderr

@@ -1,2 +1,2 @@
-+ ansible-playbook -i ../../inventory test.yml
++ ansible-playbook -i inventory test.yml
 ++ set +x

test/integration/targets/callback_default/callback_default.out.hide_skipped.stderr

@@ -1,2 +1,2 @@
-+ ansible-playbook -i ../../inventory test.yml
++ ansible-playbook -i inventory test.yml
 ++ set +x

test/integration/targets/callback_default/callback_default.out.hide_skipped_ok.stderr

@@ -1,2 +1,2 @@
-+ ansible-playbook -i ../../inventory test.yml
++ ansible-playbook -i inventory test.yml
 ++ set +x

test/integration/targets/callback_default/inventory

@@ -0,0 +1,5 @@
+[local]
+testhost ansible_connection=local
+
+[nonexistent]
+testhost5 ansible_host=169.254.199.200

test/integration/targets/callback_default/runme.sh

@@ -18,7 +18,7 @@ run_test() {
 
 	# The shenanigans with redirection and 'tee' are to capture STDOUT and
 	# STDERR separately while still displaying both to the console
-	{ ansible-playbook -i ../../inventory test.yml \
+	{ ansible-playbook -i inventory test.yml \
 		> >(set +x; tee "${OUTFILE}.${testname}.stdout"); } \
 		2> >(set +x; tee "${OUTFILE}.${testname}.stderr" >&2)
 	diff -u "${ORIGFILE}.${testname}.stdout" "${OUTFILE}.${testname}.stdout" || diff_failure
@@ -122,7 +122,7 @@ export ANSIBLE_DISPLAY_FAILED_STDERR=1
 
 # Check if UNREACHBLE is available in stderr
 set +e
-ansible-playbook -i ../../inventory test_2.yml > >(set +x; tee "${BASEFILE}.unreachable.stdout";) 2> >(set +x; tee "${BASEFILE}.unreachable.stderr" >&2) || true
+ansible-playbook -i inventory test_2.yml > >(set +x; tee "${BASEFILE}.unreachable.stdout";) 2> >(set +x; tee "${BASEFILE}.unreachable.stderr" >&2) || true
 set -e
 if test "$(grep -c 'UNREACHABLE' "${BASEFILE}.unreachable.stderr")" -ne 1; then
     echo "Test failed"