rosunit: partial port to rospkg

tools/rosunit/scripts/check_test_ran.py

@@ -37,23 +37,23 @@
 Writes a test failure out to test file if it doesn't exist.
 """
 
-from __future__ import with_statement
+from __future__ import print_function
 PKG='rosunit'
 NAME="check_test_ran.py"
 import roslib; roslib.load_manifest(PKG)
 import os
 import sys
 
-import roslib.packages
+import rospkg
 import rosunit
 
 def usage():
-    print >> sys.stderr, """Usage:
+    print("""Usage:
 \t%s test-file.xml
 or
 \t%s --rostest pkg-name test-file.xml
-"""%(NAME, NAME)
-    print sys.argv
+"""%(NAME, NAME), file=sys.stderr)
+    print(sys.argv)
     sys.exit(os.EX_USAGE)
 
 def check_main():
@@ -65,7 +65,9 @@ def check_main():
         test_pkg, test_file = [a for a in sys.argv[1:] if a != '--rostest']
         # this logic derives the output filename that rostest uses
 
-        pkg_dir, _ = roslib.packages.get_dir_pkg(test_file)
+        r = rospkg.RosPack()
+        pkg_name = rospkg.get_package_name(test_file)
+        pkg_dir = r.get_path(pkg_name)
 
         # compute test name for friendlier reporting
         outname = rosunit.rostest_name_from_path(pkg_dir, test_file)
@@ -76,13 +78,13 @@ def check_main():
             usage()
         test_file = sys.argv[1]
         
-    print "Checking for test results in %s"%test_file
+    print("Checking for test results in %s"%test_file)
     
     if not os.path.exists(test_file):
         if not os.path.exists(os.path.dirname(test_file)):
             os.makedirs(os.path.dirname(test_file))
             
-        print "Cannot find results, writing failure results to", test_file
+        print("Cannot find results, writing failure results to", test_file)
         
         with open(test_file, 'w') as f:
             test_name = os.path.basename(test_file)

tools/rosunit/src/rosunit/baretest.py

@@ -76,7 +76,7 @@ class BareTestCase(unittest.TestCase):
         """
         super(BareTestCase, self).__init__()
         self.text_mode = text_mode
-        _, self.package = roslib.packages.get_dir_pkg(exe)
+        self.package = rospkg.get_package_name(exe)
         self.exe = os.path.abspath(exe)
         if test_name is None:
             self.test_name = os.path.basename(exe)

tools/rosunit/src/rosunit/rosunit_main.py

@@ -40,7 +40,7 @@ import time
 import unittest
 import logging
 
-import roslib.packages 
+import rospkg
 
 from . import pmon
 from . core import xml_results_file, create_xml_runner
@@ -79,7 +79,7 @@ def rosunitmain():
     time_limit = float(options.time_limit) if options.time_limit else None
 
     # compute some common names we'll be using to generate test names and files
-    pkg_dir, pkg = roslib.packages.get_dir_pkg(test_file) 
+    pkg = rospkg.get_package_name(test_file)
 
     try:
         runner_result = None