Skip to content
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

expect - fix argument spec error with timeout=null #82522

Merged
merged 2 commits into from
Jan 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions changelogs/fragments/fix-expect-indefinite-timeout.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
bugfixes:
- expect - fix argument spec error using timeout=null (https://github.com/ansible/ansible/issues/80982).
10 changes: 8 additions & 2 deletions lib/ansible/modules/expect.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
responses. List functionality is new in 2.1.
required: true
timeout:
type: int
type: raw
description:
- Amount of time in seconds to wait for the expected strings. Use
V(null) to disable timeout.
Expand Down Expand Up @@ -132,6 +132,7 @@

from ansible.module_utils.basic import AnsibleModule, missing_required_lib
from ansible.module_utils.common.text.converters import to_bytes, to_native
from ansible.module_utils.common.validation import check_type_int


def response_closure(module, question, responses):
Expand All @@ -157,7 +158,7 @@ def main():
creates=dict(type='path'),
removes=dict(type='path'),
responses=dict(type='dict', required=True),
timeout=dict(type='int', default=30),
timeout=dict(type='raw', default=30),
echo=dict(type='bool', default=False),
)
)
Expand All @@ -172,6 +173,11 @@ def main():
removes = module.params['removes']
responses = module.params['responses']
timeout = module.params['timeout']
if timeout is not None:
try:
timeout = check_type_int(timeout)
except TypeError as te:
module.fail_json(msg=f"argument 'timeout' is of type {type(timeout)} and we were unable to convert to int: {te}")
echo = module.params['echo']

events = dict()
Expand Down
9 changes: 9 additions & 0 deletions test/integration/targets/expect/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,15 @@
- "echo_result.stdout_lines[-2] == 'foobar'"
- "echo_result.stdout_lines[-1] == 'bar'"

- name: test timeout is valid as null
expect:
command: "{{ansible_python_interpreter}} {{test_command_file}}"
responses:
foo: bar
echo: true
timeout: null # wait indefinitely
timeout: 2 # but shouldn't be waiting long

- name: test response list
expect:
command: "{{ansible_python_interpreter}} {{test_command_file}} foo foo"
Expand Down