rostest: #1622 rostest now reports config errors
This commit is contained in:
parent
6a44dba839
commit
0f6c2c695f
|
@ -82,10 +82,12 @@ def _setTextMode(val):
|
||||||
# global store of all ROSLaunchRunners so we can do an extra shutdown
|
# global store of all ROSLaunchRunners so we can do an extra shutdown
|
||||||
# in the rare event a tearDown fails to execute
|
# in the rare event a tearDown fails to execute
|
||||||
_test_parents = []
|
_test_parents = []
|
||||||
|
_config = None
|
||||||
def _addRostestParent(runner):
|
def _addRostestParent(runner):
|
||||||
global _test_parents
|
global _test_parents, _config
|
||||||
logger.info("_addRostestParent [%s]", runner)
|
logger.info("_addRostestParent [%s]", runner)
|
||||||
_test_parents.append(runner)
|
_test_parents.append(runner)
|
||||||
|
_config = runner.config
|
||||||
|
|
||||||
# TODO: convert most of this into a run() routine of a RoslaunchRunner subclass
|
# TODO: convert most of this into a run() routine of a RoslaunchRunner subclass
|
||||||
|
|
||||||
|
@ -319,7 +321,15 @@ def rostestmain():
|
||||||
logger.info("calling pmon_shutdown")
|
logger.info("calling pmon_shutdown")
|
||||||
pmon_shutdown()
|
pmon_shutdown()
|
||||||
logger.info("... done calling pmon_shutdown")
|
logger.info("... done calling pmon_shutdown")
|
||||||
|
|
||||||
|
# print config errors after test has run so that we don't get caught up in .xml results
|
||||||
|
if _config:
|
||||||
|
if _config.config_errors:
|
||||||
|
print >> sys.stderr, "\n[ROSTEST WARNINGS]"+'-'*62+'\n'
|
||||||
|
for err in _config.config_errors:
|
||||||
|
print >> sys.stderr, " * %s"%err
|
||||||
|
print ''
|
||||||
|
|
||||||
# summary is worthless if textMode is on as we cannot scrape .xml results
|
# summary is worthless if textMode is on as we cannot scrape .xml results
|
||||||
subtest_results = _getResults()
|
subtest_results = _getResults()
|
||||||
if not _textMode:
|
if not _textMode:
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
<launch>
|
<launch>
|
||||||
<node name="talker" pkg="test_ros" type="talker.py" />
|
<node name="talker" pkg="test_ros" type="talker.py" />
|
||||||
|
<fnode name="talker" pkg="test_ros" type="talker.py" />
|
||||||
<group ns="foo">
|
<group ns="foo">
|
||||||
<node name="talker" pkg="test_ros" type="talker.py" />
|
<node name="talker" pkg="test_ros" type="talker.py" />
|
||||||
</group>
|
</group>
|
||||||
|
|
Loading…
Reference in New Issue