autoserv: grab test results even if we had an error
From: Adrian Bauer <adrianbg@google.com>
Signed-off-by: Martin Bligh <mbligh@google.com>
git-svn-id: http://test.kernel.org/svn/autotest/trunk@1052 592f7852-d20e-0410-864c-8624ca9c26a4
diff --git a/server/autotest.py b/server/autotest.py
index 8973a00..81885f5 100644
--- a/server/autotest.py
+++ b/server/autotest.py
@@ -197,22 +197,14 @@
host.send_file(tmppath, atrun.remote_control_file)
os.remove(tmppath)
- timeout_exc = None
try:
atrun.execute_control(timeout=timeout)
- except AutotestTimeoutError, exc:
- # on timeout, fall though and try to grab results,
- # and then reraise
- timeout_exc = exc
-
- # try to retrive results, even if a timeout occured
- results = os.path.join(atrun.autodir, 'results',
- 'default')
- # Copy all dirs in default to results_dir
- host.get_file(results + '/', results_dir)
-
- if timeout_exc:
- raise timeout_exc
+ finally:
+ # get the results
+ results = os.path.join(atrun.autodir, 'results',
+ 'default')
+ # Copy all dirs in default to results_dir
+ host.get_file(results + '/', results_dir)
def run_timed_test(self, test_name, results_dir = '.', host = None,