p36850791
/
kinetic-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix --text reporting for rosunit

This commit is contained in:
Ken Conley 2011-10-11 20:20:03 +00:00
parent e1c3ca7b43
commit 03f3185b1c
2 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
tools/rosunit/src/rosunit/baretest.py
View File

@ -65,7 +65,7 @@ class TestTimeoutException(Exception): pass
class BareTestCase(unittest.TestCase):
def __init__(self, exe, args, retry=0, time_limit=None, test_name=None):
def __init__(self, exe, args, retry=0, time_limit=None, test_name=None, text_mode=False):
"""
@param exe: path to executable to run
@type exe: str
@ -78,6 +78,7 @@ class BareTestCase(unittest.TestCase):
@type test_name: str
"""
super(BareTestCase, self).__init__()
self.text_mode = text_mode
_, self.package = roslib.packages.get_dir_pkg(exe)
self.exe = os.path.abspath(exe)
if test_name is None:
@ -90,6 +91,8 @@ class BareTestCase(unittest.TestCase):
self.args = ['python', self.exe] + args
else:
self.args = [self.exe] + args
if text_mode:
self.args = self.args + ['--text']
self.retry = retry
self.time_limit = time_limit or BARE_TIME_LIMIT
@ -155,14 +158,18 @@ class BareTestCase(unittest.TestCase):
else:
printerrlog("test [%s] timed out"%test_name)
# load in test_file
if not timeout_failure:
self.assert_(os.path.isfile(test_file), "test [%s] did not generate test results"%test_name)
printlog("test [%s] results are in [%s]", test_name, test_file)
results = junitxml.read(test_file, test_name)
test_fail = results.num_errors or results.num_failures
else:
test_fail = True
if self.text_mode:
results = self.results
elif not self.text_mode:
# load in test_file
if not timeout_failure:
self.assert_(os.path.isfile(test_file), "test [%s] did not generate test results"%test_name)
printlog("test [%s] results are in [%s]", test_name, test_file)
results = junitxml.read(test_file, test_name)
test_fail = results.num_errors or results.num_failures
else:
test_fail = True
if self.retry > 0 and test_fail:
self.retry -= 1
@ -487,8 +494,9 @@ def print_runner_summary(runner_results, junit_results, runner_name='ROSUNIT'):
# confusing. 'result' counts successful _running_ of tests
# (i.e. doesn't check for actual test success). The 'r' result
# object contains results of the actual tests.
buff = cStringIO.StringIO()
buff.write("[%s]"%(runner_name)+'-'*71+'\n\n')
for tc_result in junit_results.test_case_results:
buff.write(tc_result.description)

10
tools/rosunit/src/rosunit/rosunit_main.py
View File

@ -94,17 +94,17 @@ def rosunitmain():
pkg_dir, pkg = roslib.packages.get_dir_pkg(test_file)
try:
runner_result = None
results = Result('rosunit', 0, 0, 0)
test_case = BareTestCase(test_file, args[1:], \
retry=0, time_limit=time_limit, \
test_name=test_name)
retry=0, time_limit=time_limit, \
test_name=test_name, text_mode=options.text_mode)
suite = unittest.TestSuite()
suite.addTest(test_case)
if options.text_mode:
result = unittest.TextTestRunner(verbosity=2).run(suite)
result = unittest.TextTestRunner(stream=sys.stdout, verbosity=2).run(suite)
else:
results_file = xml_results_file(pkg, test_name, True)
# the is_rostest really just means "wrapper"
@ -127,7 +127,7 @@ def rosunitmain():
if logfile_name:
print "rosunit log file is in %s"%logfile_name
if not runner_result.wasSuccessful():
if runner_result is not None and not runner_result.wasSuccessful():
sys.exit(1)
elif results.num_errors or results.num_failures:
sys.exit(2)