From 63987d8807af82cf19406e04cd478827c7a07b6f Mon Sep 17 00:00:00 2001
From: Ken Conley <kwc@kwc.org>
Date: Sat, 19 Sep 2009 01:10:26 +0000
Subject: [PATCH] cleaning up more rospy_tutorials test dependencies

---
 test/test_roslaunch/test/test_nodeprocess.py | 8 ++++----
 tools/roslaunch/example.launch               | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/test/test_roslaunch/test/test_nodeprocess.py b/test/test_roslaunch/test/test_nodeprocess.py
index 0545e2cb..258fd61a 100644
--- a/test/test_roslaunch/test/test_nodeprocess.py
+++ b/test/test_roslaunch/test/test_nodeprocess.py
@@ -107,7 +107,7 @@ class TestNodeprocess(unittest.TestCase):
             pass
         
         # have to specify a real node
-        n = Node('rospy_tutorials','talker.py')
+        n = Node('test_ros','talker.py')
 
         n.machine = None
         try: # should fail b/c n.machine is not set
@@ -132,7 +132,7 @@ class TestNodeprocess(unittest.TestCase):
                 self.fail('%s should not be set: %s'%(k,d[k]))
 
         # test package and name
-        self.assertEquals(p.package, 'rospy_tutorials')
+        self.assertEquals(p.package, 'test_ros')
         # - no 'correct' full answer here 
         self.assert_(p.name.startswith('talker'))
 
@@ -162,7 +162,7 @@ class TestNodeprocess(unittest.TestCase):
         n.args = ''
         p = create_node_process(run_id, n, master_uri)
         # - the first arg should be the path to the node executable
-        cmd = roslib.packages.find_node('rospy_tutorials', 'talker.py', ros_root, rpp)
+        cmd = roslib.packages.find_node('test_ros', 'talker.py', ros_root, rpp)
         self.assertEquals(p.args[0], cmd)
 
         # - test basic args
@@ -179,7 +179,7 @@ class TestNodeprocess(unittest.TestCase):
         self.assert_('KEY2:=VAL2' in p.args)
         
         # - test __name
-        n = Node('rospy_tutorials','talker.py')
+        n = Node('test_ros','talker.py')
         n.name = 'fooname'
         n.machine = m
         self.assert_('__name:=fooname' in create_node_process(run_id, n, master_uri).args)
diff --git a/tools/roslaunch/example.launch b/tools/roslaunch/example.launch
index 49d5c7ab..9119a9d6 100644
--- a/tools/roslaunch/example.launch
+++ b/tools/roslaunch/example.launch
@@ -37,9 +37,9 @@
     <!-- remap applies to all future nodes in this group -->
     <remap from="chatter" to="hello"/> 
 
-    <node name="listener" pkg="rospy_tutorials" type="listener" args="$(find rospy_tutorials)/msg/Msg.msg" respawn="true" />
+    <node name="listener" pkg="test_ros" type="listener" respawn="true" />
 
-    <node name="talker-1" pkg="rospy_tutorials" type="talker">
+    <node name="talker-1" pkg="test_ros" type="talker">
       <env name="ENV_EXAMPLE" value="example value" />
       <remap from="foo" to="bar"/>
       <!-- params within node tags are equivalent to ~params. 
@@ -47,7 +47,7 @@
       <param name="talker_param" value="a value" />
     </node>
 
-    <node name="talker-2" pkg="rospy_tutorials" type="talker" />
+    <node name="talker-2" pkg="test_ros" type="talker" />
 
   </group>