fixed test launch files

fkie · Aug 11, 2023 · ffff604 · ffff604
1 parent 7da78a9
commit ffff604
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/fkie_multimaster_pylib/fkie_multimaster_pylib/tests/test_launch/include_dummy.launch b/fkie_multimaster_pylib/fkie_multimaster_pylib/tests/test_launch/include_dummy.launch
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <launch>
 	<!--
-	<include file="$(find fkie_multimaster_msgs)/fkie_multimaster_msgs/tests/test_launch/included1.launch">
+	<include file="$(find fkie_multimaster_pylib)/fkie_multimaster_pylib/tests/test_launch/included1.launch">
 	-->
-	<include file="$(find fkie_multimaster_msgs)/fkie_multimaster_msgs/tests/test_launch/included1.launch">
+	<include file="$(find fkie_multimaster_pylib)/fkie_multimaster_pylib/tests/test_launch/included1.launch">
 		<arg name="inc" value= "included2" />
 	</include>
-	<!--	<include file="$(find fkie_multimaster_msgs)/fkie_multimaster_msgs/tests/test_launch/included1.launch"> -->
-	<include file="$(find fkie_multimaster_msgs)/fkie_multimaster_msgs/tests/test_launch/included1.launch" />
-	<include file="$(find invalid_package)/fkie_multimaster_msgs/tests/test_launch/included1.launch"/>
-	<arg name="include1" value= "$(find fkie_multimaster_msgs)/fkie_multimaster_msgs/tests/test_launch/included1.launch" />
-	<rosparam param="paramter" file="$(find fkie_multimaster_msgs)/fkie_multimaster_msgs/tests/test_launch/included1.launch" command="load" subst_value="true"/>
-	<node name="rviz" pkg="rviz" type="rviz" args="-d $(find fkie_multimaster_msgs)/launch/invalid_cfg.rviz"/>
+	<!--	<include file="$(find fkie_multimaster_pylib)/fkie_multimaster_pylib/tests/test_launch/included1.launch"> -->
+	<include file="$(find fkie_multimaster_pylib)/fkie_multimaster_pylib/tests/test_launch/included1.launch" />
+	<include file="$(find invalid_package)/fkie_multimaster_pylib/tests/test_launch/included1.launch"/>
+	<arg name="include1" value= "$(find fkie_multimaster_pylib)/fkie_multimaster_pylib/tests/test_launch/included1.launch" />
+	<rosparam param="paramter" file="$(find fkie_multimaster_pylib)/fkie_multimaster_pylib/tests/test_launch/included1.launch" command="load" subst_value="true"/>
+	<node name="rviz" pkg="rviz" type="rviz" args="-d $(find fkie_multimaster_pylib)/launch/invalid_cfg.rviz"/>
 
 </launch>
diff --git a/fkie_multimaster_pylib/fkie_multimaster_pylib/tests/test_launch/included1.launch b/fkie_multimaster_pylib/fkie_multimaster_pylib/tests/test_launch/included1.launch
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <launch>
 	<arg name="inc" value= "included3" />
-	<include file="$(find fkie_multimaster_msgs)/fkie_multimaster_msgs/tests/test_launch/$(arg inc).launch"/>
+	<include file="$(find fkie_multimaster_pylib)/fkie_multimaster_pylib/tests/test_launch/$(arg inc).launch"/>
 </launch>
diff --git a/fkie_multimaster_pylib/fkie_multimaster_pylib/tests/test_launch/test_wrong_include.launch b/fkie_multimaster_pylib/fkie_multimaster_pylib/tests/test_launch/test_wrong_include.launch
@@ -6,9 +6,9 @@
    <param name="tf_prefix" value="$(arg robot_ns)" />
 
 	<group ns="$(arg robot_ns)">
-	  <node name="fkie_multimaster_msgs" pkg="fkie_multimaster_msgs"
-	        type="fkie_multimaster_msgs" args="
-	        -configuration_directory $(find fkie_multimaster_msgs)/fkie_multimaster_msgs/tests/test_launch
+	  <node name="fkie_multimaster_pylib" pkg="fkie_multimaster_pylib"
+	        type="fkie_multimaster_pylib" args="
+	        -configuration_directory $(find fkie_multimaster_pylib)/fkie_multimaster_pylib/tests/test_launch
 	        -configuration_basename packbot_cartographer.lua"
 	        output="screen">
 	    	 <param name="capability_group" value="localization_cartographer" />

diff --git a/fkie_multimaster_pylib/setup.py b/fkie_multimaster_pylib/setup.py
@@ -3,7 +3,7 @@
 package_name = 'fkie_multimaster_pylib'
 
 if 'ROS_VERSION' in os.environ and os.environ['ROS_VERSION'] == '1':
-    from distutils.core import setup
+    from setuptools import setup
     from catkin_pkg.python_setup import generate_distutils_setup
 
     d = generate_distutils_setup(

diff --git a/fkie_node_manager_daemon/setup.py b/fkie_node_manager_daemon/setup.py
@@ -3,7 +3,7 @@
 package_name = 'fkie_node_manager_daemon'
 
 if 'ROS_VERSION' in os.environ and os.environ['ROS_VERSION'] == '1':
-    from distutils.core import setup
+    from setuptools import setup
     from catkin_pkg.python_setup import generate_distutils_setup
 
     d = generate_distutils_setup(