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

port to rospkg

This commit is contained in:
Ken Conley 2011-10-06 18:59:50 +00:00
parent 4e5722482e
commit 97355b3173
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,6 +46,8 @@ import signal
import subprocess
import traceback
import rospkg
import roslib.packages
from .core import xml_results_file, rostest_name_from_path, create_xml_runner, printlog, printerrlog, printlog_bold
@ -235,7 +237,7 @@ class LocalProcess(pmon.Process):
name. Values are None if stdout/stderr are not logged.
@rtype: str, str
"""
log_dir = roslib.rosenv.get_log_dir(env=os.environ)
log_dir = rospkg.get_log_dir(env=os.environ)
if self.run_id:
log_dir = os.path.join(log_dir, self.run_id)
if not os.path.exists(log_dir):
@ -310,7 +312,7 @@ class LocalProcess(pmon.Process):
elif self.cwd == 'ros-root':
cwd = get_ros_root()
else:
cwd = roslib.rosenv.get_ros_home()
cwd = rospkg.get_ros_home()
_logger.info("process[%s]: start w/ args [%s]", self.name, self.args)
_logger.info("process[%s]: cwd will be [%s]", self.name, cwd)