Remove ReverifyTask altogether, and trust the return code of autoserv repair (which does a reverify itself). The flowchart on the wiki is updated.
Also change autoserv's repair code a bit so we can really trust it.
Signed-off-by: Steve Howard <showard@google.com>
git-svn-id: http://test.kernel.org/svn/autotest/trunk@1294 592f7852-d20e-0410-864c-8624ca9c26a4
diff --git a/server/server_job.py b/server/server_job.py
index 0c272ec..d217d88 100755
--- a/server/server_job.py
+++ b/server/server_job.py
@@ -11,7 +11,7 @@
Andy Whitcroft <apw@shadowen.org>
"""
-import os, sys, re, time, select
+import os, sys, re, time, select, traceback
import test
from utils import *
from common.error import *
@@ -194,7 +194,12 @@
if not self.machines:
raise AutoservError('No machines specified to repair')
namespace = {'machines' : self.machines, 'job' : self}
- exec(preamble + repair, namespace, namespace)
+ # no matter what happens during repair, go on to try to reverify
+ try:
+ exec(preamble + repair, namespace, namespace)
+ except Exception, exc:
+ print 'Exception occured during repair'
+ traceback.print_exc()
self.verify()