Risk: Low
Visibility: Fix up the reason field associated with server-side
group failures.
The existing code for logging group failures on the server-side just
uses the traceback as the reason field. This is pretty much completely
useless, as it results in a reason of
"Traceback (most recent call last): ". Instead, do what the
client-side code already does and first prepend the line with the
actual exception text (so the traceback will only get included as
non-parsed debug output).
Signed-off-by: John Admanski <jadmanski@google.com>
git-svn-id: http://test.kernel.org/svn/autotest/trunk@1576 592f7852-d20e-0410-864c-8624ca9c26a4
diff --git a/server/server_job.py b/server/server_job.py
index 3aa638b..48e755e 100755
--- a/server/server_job.py
+++ b/server/server_job.py
@@ -391,10 +391,11 @@
self.record('START', None, name)
self.record_prefix += '\t'
result = function(*args, **dargs)
- except Exception:
+ except Exception, e:
self.record_prefix = old_record_prefix
- self.record('END FAIL', None, name,
- traceback.format_exc())
+ err_msg = str(e) + '\n'
+ err_msg += traceback.format_exc()
+ self.record('END FAIL', None, name, err_msg)
else:
self.record_prefix = old_record_prefix
self.record('END GOOD', None, name)
@@ -428,10 +429,10 @@
self.record('START', None, 'reboot')
self.record_prefix += '\t'
reboot_func()
- except Exception:
+ except Exception, e:
self.record_prefix = old_record_prefix
- self.record('END FAIL', None, 'reboot',
- traceback.format_exc())
+ err_msg = str(e) + '\n' + traceback.format_exc()
+ self.record('END FAIL', None, 'reboot', err_msg)
else:
kernel = get_kernel_func()
self.record_prefix = old_record_prefix