From 20bffbcfc0d58d7c571e7c7a570648f21ddae425 Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Tue, 24 Sep 2019 12:12:52 +1000 Subject: [PATCH] Remove invalid argument from format_exc() calls The argument here is an integer "limit", not the exception. I think that we only notice this on Python 3 because of exception chaining. It causes a real failure though because the exception handler that is meant to fall into "pass" raises another exception when ipv6 doesn't work. Change-Id: I0908a0a3dbb2356caabbffd062379751a0b61c41 --- roles/validate-host/library/zuul_debug_info.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/validate-host/library/zuul_debug_info.py b/roles/validate-host/library/zuul_debug_info.py index 8fc85d3e8..ce3be447f 100644 --- a/roles/validate-host/library/zuul_debug_info.py +++ b/roles/validate-host/library/zuul_debug_info.py @@ -70,7 +70,7 @@ def main(): 'traceroute6 -n {host}'.format(host=traceroute_host)) passed = True except (subprocess.CalledProcessError, OSError) as e: - ret['traceroute_v6_exception'] = traceback.format_exc(e) + ret['traceroute_v6_exception'] = traceback.format_exc() ret['traceroute_v6_output'] = e.output ret['traceroute_v6_return'] = e.returncode pass @@ -79,7 +79,7 @@ def main(): 'traceroute -n {host}'.format(host=traceroute_host)) passed = True except (subprocess.CalledProcessError, OSError) as e: - ret['traceroute_v4_exception'] = traceback.format_exc(e) + ret['traceroute_v4_exception'] = traceback.format_exc() ret['traceroute_v4_output'] = e.output ret['traceroute_v4_return'] = e.returncode pass