Remove the reason logging from END messages when running a group
for "standard" failures (e.g. TestFail, TestError, etc.). The reason
should already be logged at the point of failure, so the duplicate
message is just noise.
Risk: High
Visibility: END reasons for normal failures should be empty
Signed-off-by: John Admanski <[email protected]>
git-svn-id: http://test.kernel.org/svn/autotest/trunk@2619 592f7852-d20e-0410-864c-8624ca9c26a4
diff --git a/client/bin/job.py b/client/bin/job.py
index f82a54c..cebc74d 100755
--- a/client/bin/job.py
+++ b/client/bin/job.py
@@ -522,11 +522,11 @@
return result
except error.TestBaseException, e:
self._decrement_group_level()
- self.record('END %s' % e.exit_status, subdir, testname, str(e))
+ self.record('END %s' % e.exit_status, subdir, testname)
raise
except error.JobError, e:
self._decrement_group_level()
- self.record('END ABORT', subdir, testname, str(e))
+ self.record('END ABORT', subdir, testname)
raise
except Exception, e:
# This should only ever happen due to a bug in the given
diff --git a/client/bin/job_unittest.py b/client/bin/job_unittest.py
index 7f21ddb..1f99548 100644
--- a/client/bin/job_unittest.py
+++ b/client/bin/job_unittest.py
@@ -345,8 +345,7 @@
self.job.record.expect_call("ERROR", testname, testname,
first_line_comparator(str(real_error)))
self.job._decrement_group_level.expect_call()
- self.job.record.expect_call("END ERROR", testname, testname,
- first_line_comparator(str(real_error)))
+ self.job.record.expect_call("END ERROR", testname, testname)
self.job.harness.run_test_complete.expect_call()
utils.drop_caches.expect_call()
@@ -386,7 +385,7 @@
unhandled_error)
self.job.record.expect_call("ERROR", testname, testname, reason)
self.job._decrement_group_level.expect_call()
- self.job.record.expect_call("END ERROR", testname, testname, reason)
+ self.job.record.expect_call("END ERROR", testname, testname)
self.job.harness.run_test_complete.expect_call()
utils.drop_caches.expect_call()
diff --git a/server/server_job.py b/server/server_job.py
index a37aa71..8f0ae00 100755
--- a/server/server_job.py
+++ b/server/server_job.py
@@ -464,7 +464,7 @@
finally:
self.record_prefix = old_record_prefix
except error.TestBaseException, e:
- self.record("END %s" % e.exit_status, subdir, name, str(e))
+ self.record("END %s" % e.exit_status, subdir, name)
exc_info = sys.exc_info()
except Exception, e:
err_msg = str(e) + '\n'
diff --git a/server/server_job_unittest.py b/server/server_job_unittest.py
index 5d1a3e6..9b43195 100644
--- a/server/server_job_unittest.py
+++ b/server/server_job_unittest.py
@@ -244,8 +244,7 @@
test.runtest.expect_call(self.job, url, None, (), {}).and_raises(e)
self.job.record.expect_call('ERROR', testname, testname,
'Unexpected error')
- self.job.record.expect_call('END ERROR', testname, testname,
- 'Unexpected error')
+ self.job.record.expect_call('END ERROR', testname, testname)
# run and check
self.job.run_test(url)
@@ -272,8 +271,7 @@
test.runtest.expect_call(self.job, url, None, (), {}).and_raises(e)
self.job.record.expect_call('FAIL', testname, testname,
'The test failed!')
- self.job.record.expect_call('END FAIL', testname, testname,
- 'The test failed!')
+ self.job.record.expect_call('END FAIL', testname, testname)
# run and check
self.job.run_test(url)
