summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorBrian Coca <bcoca@users.noreply.github.com>2020-05-01 15:03:07 -0400
committerMatt Clay <matt@mystile.com>2020-05-05 20:37:46 -0700
commitb3a1288150ba92f80fc2f37c39fed80705d45ce6 (patch)
tree475cec256f9ed0d70731105c50f208830364dd35 /test
parente2f7676c5af7752e83877f57e5271cb364c8f6d4 (diff)
downloadansible-b3a1288150ba92f80fc2f37c39fed80705d45ce6.tar.gz
preserve json parsing error (#58461)
* preserve json parsing error * added test (cherry picked from commit bbdf77a59f50306b34161efc148b572ab257a537)
Diffstat (limited to 'test')
-rw-r--r--test/integration/targets/dataloader/aliases1
-rw-r--r--test/integration/targets/dataloader/attempt_to_load_invalid_json.yml4
-rwxr-xr-xtest/integration/targets/dataloader/runme.sh6
-rw-r--r--test/integration/targets/dataloader/vars/invalid.json1
4 files changed, 12 insertions, 0 deletions
diff --git a/test/integration/targets/dataloader/aliases b/test/integration/targets/dataloader/aliases
new file mode 100644
index 0000000000..a6dafcf8cd
--- /dev/null
+++ b/test/integration/targets/dataloader/aliases
@@ -0,0 +1 @@
+shippable/posix/group1
diff --git a/test/integration/targets/dataloader/attempt_to_load_invalid_json.yml b/test/integration/targets/dataloader/attempt_to_load_invalid_json.yml
new file mode 100644
index 0000000000..536e6daa83
--- /dev/null
+++ b/test/integration/targets/dataloader/attempt_to_load_invalid_json.yml
@@ -0,0 +1,4 @@
+- hosts: localhost
+ gather_facts: false
+ vars_files:
+ - vars/invalid.json
diff --git a/test/integration/targets/dataloader/runme.sh b/test/integration/targets/dataloader/runme.sh
new file mode 100755
index 0000000000..6a1bc9a0c2
--- /dev/null
+++ b/test/integration/targets/dataloader/runme.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+set -eux
+
+# check if we get proper json error
+ansible-playbook -i ../../inventory attempt_to_load_invalid_json.yml "$@" 2>&1|grep 'JSON:'
diff --git a/test/integration/targets/dataloader/vars/invalid.json b/test/integration/targets/dataloader/vars/invalid.json
new file mode 100644
index 0000000000..8d4e4304b8
--- /dev/null
+++ b/test/integration/targets/dataloader/vars/invalid.json
@@ -0,0 +1 @@
+{ }}