-
Notifications
You must be signed in to change notification settings - Fork 23.7k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add tests for WANT_JSON and old style modules #50555
Changes from all commits
fb1a078
12efaa1
4b7b929
dda7877
dbab8e3
4afa97a
a6d8e97
1656a1d
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
shippable/posix/group3 |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
#!/bin/sh | ||
# This file is part of Ansible | ||
# | ||
# Ansible is free software: you can redistribute it and/or modify | ||
# it under the terms of the GNU General Public License as published by | ||
# the Free Software Foundation, either version 3 of the License, or | ||
# (at your option) any later version. | ||
# | ||
# Ansible is distributed in the hope that it will be useful, | ||
# but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
# GNU General Public License for more details. | ||
# | ||
# You should have received a copy of the GNU General Public License | ||
# along with Ansible. If not, see <http://www.gnu.org/licenses/>. | ||
|
||
if [ -f "$1" ]; then | ||
. "$1" | ||
else | ||
echo '{"msg": "No argument file provided", "failed": true}' | ||
exit 1 | ||
fi | ||
|
||
salutation=${salutation:=Hello} | ||
name=${name:=World} | ||
|
||
cat << EOF | ||
{"msg": "${salutation}, ${name}!"} | ||
EOF |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,39 @@ | ||
- name: Hello, World! | ||
helloworld: | ||
register: hello_world | ||
|
||
- assert: | ||
that: | ||
- 'hello_world.msg == "Hello, World!"' | ||
|
||
- name: Hello, Ansible! | ||
helloworld: | ||
args: | ||
name: Ansible | ||
register: hello_ansible | ||
|
||
- assert: | ||
that: | ||
- 'hello_ansible.msg == "Hello, Ansible!"' | ||
|
||
- name: Goodbye, Ansible! | ||
helloworld: | ||
args: | ||
salutation: Goodbye | ||
name: Ansible | ||
register: goodbye_ansible | ||
|
||
- assert: | ||
that: | ||
- 'goodbye_ansible.msg == "Goodbye, Ansible!"' | ||
|
||
- name: Execute module directly | ||
command: '/bin/sh {{ role_path }}/library/helloworld.sh' | ||
register: direct | ||
ignore_errors: true | ||
|
||
- assert: | ||
that: | ||
- direct is failed | ||
- | | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Why the multi-line syntax here? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I had done it originally due to simplifying quoting, but after a change it's no longer needed, I just didn't remove it. It wasn't done for multiline, but rather as a block literal, to avoid the need for outer quotes which would have complicated things. |
||
direct.stdout == '{"msg": "No argument file provided", "failed": true}' |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
shippable/posix/group3 |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
#!/usr/bin/python | ||
# This file is part of Ansible | ||
# | ||
# Ansible is free software: you can redistribute it and/or modify | ||
# it under the terms of the GNU General Public License as published by | ||
# the Free Software Foundation, either version 3 of the License, or | ||
# (at your option) any later version. | ||
# | ||
# Ansible is distributed in the hope that it will be useful, | ||
# but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
# GNU General Public License for more details. | ||
# | ||
# You should have received a copy of the GNU General Public License | ||
# along with Ansible. If not, see <http://www.gnu.org/licenses/>. | ||
|
||
# WANT_JSON | ||
|
||
import json | ||
import sys | ||
|
||
try: | ||
with open(sys.argv[1], 'r') as f: | ||
data = json.load(f) | ||
except (IOError, OSError, IndexError): | ||
print(json.dumps(dict(msg="No argument file provided", failed=True))) | ||
sys.exit(1) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Since this module includes an error check for no argument file, I'd include testing that in the integration test. Just execute it as a script instead of a module to verify it fails as expected. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Addressed in the latest commit |
||
|
||
salutation = data.get('salutation', 'Hello') | ||
name = data.get('name', 'World') | ||
print(json.dumps(dict(msg='%s, %s!' % (salutation, name)))) |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,39 @@ | ||
- name: Hello, World! | ||
helloworld: | ||
register: hello_world | ||
|
||
- assert: | ||
that: | ||
- 'hello_world.msg == "Hello, World!"' | ||
|
||
- name: Hello, Ansible! | ||
helloworld: | ||
args: | ||
name: Ansible | ||
register: hello_ansible | ||
|
||
- assert: | ||
that: | ||
- 'hello_ansible.msg == "Hello, Ansible!"' | ||
|
||
- name: Goodbye, Ansible! | ||
helloworld: | ||
args: | ||
salutation: Goodbye | ||
name: Ansible | ||
register: goodbye_ansible | ||
|
||
- assert: | ||
that: | ||
- 'goodbye_ansible.msg == "Goodbye, Ansible!"' | ||
|
||
- name: Execute module directly | ||
command: '{{ ansible_python_interpreter|default(ansible_playbook_python) }} {{ role_path }}/library/helloworld.py' | ||
register: direct | ||
ignore_errors: true | ||
|
||
- assert: | ||
that: | ||
- direct is failed | ||
- | | ||
direct.stdout == '{"msg": "No argument file provided", "failed": true}' |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Since this module includes an error check for no argument file, I'd include testing that in the integration test. Just execute it as a script instead of a module to verify it fails as expected.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Addressed in the latest commit