diff --git a/tools/roslaunch/example-env-substutition.xml b/tools/roslaunch/resources/example-env-substutition.xml
similarity index 100%
rename from tools/roslaunch/example-env-substutition.xml
rename to tools/roslaunch/resources/example-env-substutition.xml
diff --git a/tools/roslaunch/example-gdb.launch b/tools/roslaunch/resources/example-gdb.launch
similarity index 100%
rename from tools/roslaunch/example-gdb.launch
rename to tools/roslaunch/resources/example-gdb.launch
diff --git a/tools/roslaunch/example-include.launch b/tools/roslaunch/resources/example-include.launch
similarity index 100%
rename from tools/roslaunch/example-include.launch
rename to tools/roslaunch/resources/example-include.launch
diff --git a/tools/roslaunch/example-min.launch b/tools/roslaunch/resources/example-min.launch
similarity index 100%
rename from tools/roslaunch/example-min.launch
rename to tools/roslaunch/resources/example-min.launch
diff --git a/tools/roslaunch/example-params.launch b/tools/roslaunch/resources/example-params.launch
similarity index 100%
rename from tools/roslaunch/example-params.launch
rename to tools/roslaunch/resources/example-params.launch
diff --git a/tools/roslaunch/example-ssh.launch b/tools/roslaunch/resources/example-ssh.launch
similarity index 100%
rename from tools/roslaunch/example-ssh.launch
rename to tools/roslaunch/resources/example-ssh.launch
diff --git a/tools/roslaunch/example.launch b/tools/roslaunch/resources/example.launch
similarity index 100%
rename from tools/roslaunch/example.launch
rename to tools/roslaunch/resources/example.launch
diff --git a/tools/roslaunch/test/unit/test_roslaunch_parent.py b/tools/roslaunch/test/unit/test_roslaunch_parent.py
index 9d5935baeb..278e4c8247 100644
--- a/tools/roslaunch/test/unit/test_roslaunch_parent.py
+++ b/tools/roslaunch/test/unit/test_roslaunch_parent.py
@@ -38,6 +38,7 @@
from xmlrpclib import ServerProxy
+import rospkg
import rosgraph.network
import roslaunch.parent
@@ -142,9 +143,8 @@ def _subroslaunchParent(self):
self.assertEquals(True, p.is_core)
self.assertEquals(False, p.local_only)
- import roslib.packages
- rl_dir = roslib.packages.get_pkg_dir('roslaunch')
- rl_file = os.path.join(rl_dir, 'example.launch')
+ rl_dir = rospkg.RosPack().get_path('roslaunch')
+ rl_file = os.path.join(rl_dir, 'resources', 'example.launch')
self.assert_(os.path.isfile(rl_file))
# validate load_config logic
@@ -176,7 +176,7 @@ def _subroslaunchParent(self):
except roslaunch.core.RLException: pass
# try again with bad xml
- rl_dir = roslib.packages.get_pkg_dir('roslaunch')
+ rl_dir = rospkg.RosPack.get_path('roslaunch')
rl_file = os.path.join(rl_dir, 'test', 'xml', 'test-params-invalid-1.xml')
self.assert_(os.path.isfile(rl_file))
p = ROSLaunchParent(run_id, [rl_file])
diff --git a/tools/roslaunch/test/unit/test_roslaunch_rlutil.py b/tools/roslaunch/test/unit/test_roslaunch_rlutil.py
index 0c1fd188aa..2fd0c34d8f 100644
--- a/tools/roslaunch/test/unit/test_roslaunch_rlutil.py
+++ b/tools/roslaunch/test/unit/test_roslaunch_rlutil.py
@@ -44,6 +44,10 @@ def get_test_path():
# two directories up from here
return os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..'))
+# path to example.launch directory
+def get_example_path():
+ return os.path.abspath(os.path.join(os.path.dirname(__file__), '..', 'resources'))
+
## Test roslaunch.node_args
class TestRoslaunchRlutil(unittest.TestCase):
@@ -51,7 +55,7 @@ def test_resolve_launch_arguments(self):
from roslaunch.rlutil import resolve_launch_arguments
roslaunch_dir = get_test_path()
- example_xml_p = os.path.join(roslaunch_dir, 'example.launch')
+ example_xml_p = os.path.join(get_example_path(), 'example.launch')
tests = [
([], []),
(['roslaunch', 'example.launch'], [example_xml_p]),
diff --git a/tools/roslaunch/test/unit/test_xmlloader.py b/tools/roslaunch/test/unit/test_xmlloader.py
index 094a913ece..dd7d880b07 100755
--- a/tools/roslaunch/test/unit/test_xmlloader.py
+++ b/tools/roslaunch/test/unit/test_xmlloader.py
@@ -43,7 +43,7 @@ def get_test_path():
# path to example.launch directory
def get_example_path():
- return os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
+ return os.path.abspath(os.path.join(os.path.dirname(__file__), '..', 'resources'))
## Fake RosLaunch object
class RosLaunchMock(object):
diff --git a/tools/roslaunch/test/xml/test-params-valid.xml b/tools/roslaunch/test/xml/test-params-valid.xml
index 96fe3d66ad..428a9b4c88 100644
--- a/tools/roslaunch/test/xml/test-params-valid.xml
+++ b/tools/roslaunch/test/xml/test-params-valid.xml
@@ -26,11 +26,11 @@
-
+
-
+
-
+