Merge "Check ret for None in zuul_run_command" into feature/zuulv3
This commit is contained in:
commit
fa1f2ca5a1
|
@ -10,3 +10,7 @@
|
||||||
that:
|
that:
|
||||||
- st.stat.exists
|
- st.stat.exists
|
||||||
- st.stat.isreg
|
- st.stat.isreg
|
||||||
|
|
||||||
|
- name: Simple shell task.
|
||||||
|
shell: |+
|
||||||
|
echo "Hello world"
|
||||||
|
|
|
@ -409,9 +409,9 @@ def zuul_run_command(self, args, zuul_log_id, check_rc=False, close_fds=True, ex
|
||||||
if t.isAlive():
|
if t.isAlive():
|
||||||
console.addLine("[Zuul] standard output/error still open "
|
console.addLine("[Zuul] standard output/error still open "
|
||||||
"after child exited")
|
"after child exited")
|
||||||
if not ret and fail_json_kwargs:
|
if ret is None and fail_json_kwargs:
|
||||||
ret = fail_json_kwargs['rc']
|
ret = fail_json_kwargs['rc']
|
||||||
elif not ret and not fail_json_kwargs:
|
elif ret is None and not fail_json_kwargs:
|
||||||
ret = -1
|
ret = -1
|
||||||
console.addLine("[Zuul] Task exit code: %s\n" % ret)
|
console.addLine("[Zuul] Task exit code: %s\n" % ret)
|
||||||
if ret == -1 and not fail_json_kwargs:
|
if ret == -1 and not fail_json_kwargs:
|
||||||
|
|
Loading…
Reference in New Issue