Move tests into self-test
Signed-off-by: Martin J. Bligh <mbligh@google.com>
git-svn-id: http://test.kernel.org/svn/autotest/trunk@803 592f7852-d20e-0410-864c-8624ca9c26a4
diff --git a/server/server_job.py b/server/server_job.py
index 495b970..9ac59ba 100755
--- a/server/server_job.py
+++ b/server/server_job.py
@@ -131,33 +131,21 @@
url of the test to run
"""
- if not url:
- raise "Test name is invalid. Switched arguments?"
(group, testname) = test.testname(url)
tag = None
subdir = testname
+
if dargs.has_key('tag'):
tag = dargs['tag']
del dargs['tag']
if tag:
subdir += '.' + tag
- try:
- try:
- self.__runtest(url, tag, args, dargs)
- except Exception, detail:
- self.record('FAIL', subdir, testname, \
- detail.__str__())
- raise
- else:
- self.record('GOOD', subdir, testname, \
- 'completed successfully')
- except TestError:
- return 0
- except:
- raise
- else:
- return 1
+ try:
+ test.runtest(self, url, tag, args, dargs)
+ self.record('GOOD', subdir, testname, 'completed successfully')
+ except Exception, detail:
+ self.record('FAIL', subdir, testname, detail.__str__())
def run_group(self, function, *args, **dargs):