try to fix tests

bluenviron · May 8, 2024 · 7f5021d · 7f5021d
1 parent 19c796a
commit 7f5021d
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 16 deletions.
diff --git a/node_funcs_master_test.go b/node_funcs_master_test.go
@@ -14,7 +14,7 @@ func TestNodeMasterGetNodes(t *testing.T) {
 	m := newContainerMaster(t)
 	defer m.close()
 
-	p := newContainer(t, "node-gen", m.IP())
+	p := newContainer(t, "node-generic", m.IP())
 	defer p.close()
 
 	n1, err := NewNode(NodeConf{
@@ -37,16 +37,16 @@ func TestNodeMasterGetNodes(t *testing.T) {
 
 	require.Equal(t, 4, len(res))
 
-	node, ok := res["/myns/nodegen"]
+	node, ok := res["/myns/nodegeneric"]
 	require.True(t, ok)
 
 	_, ok = node.PublishedTopics["/rosout"]
 	require.True(t, ok)
 
-	_, ok = node.ProvidedServices["/myns/nodegen/set_logger_level"]
+	_, ok = node.ProvidedServices["/myns/nodegeneric/set_logger_level"]
 	require.True(t, ok)
 
-	_, ok = node.ProvidedServices["/myns/nodegen/get_loggers"]
+	_, ok = node.ProvidedServices["/myns/nodegeneric/get_loggers"]
 	require.True(t, ok)
 
 	n2.Close()
@@ -61,7 +61,7 @@ func TestNodeMasterGetMachines(t *testing.T) {
 	m := newContainerMaster(t)
 	defer m.close()
 
-	p := newContainer(t, "node-gen", m.IP())
+	p := newContainer(t, "node-generic", m.IP())
 	defer p.close()
 
 	n, err := NewNode(NodeConf{

diff --git a/node_funcs_node_test.go b/node_funcs_node_test.go
@@ -18,13 +18,13 @@ func TestNodeNodePing(t *testing.T) {
 
 			switch node {
 			case "cpp":
-				p := newContainer(t, "node-gen", m.IP())
+				p := newContainer(t, "node-generic", m.IP())
 				defer p.close()
 
 			case "go":
 				n1, err := NewNode(NodeConf{
 					Namespace:     "/myns",
-					Name:          "nodegen",
+					Name:          "nodegeneric",
 					MasterAddress: m.IP() + ":11311",
 				})
 				require.NoError(t, err)
@@ -47,7 +47,7 @@ func TestNodeNodePing(t *testing.T) {
 			require.NoError(t, err)
 			defer n.Close()
 
-			_, err = n.NodePing("nodegen")
+			_, err = n.NodePing("nodegeneric")
 			require.NoError(t, err)
 		})
 	}
@@ -64,13 +64,13 @@ func TestNodeNodeKill(t *testing.T) {
 
 			switch node {
 			case "cpp":
-				p := newContainer(t, "node-gen", m.IP())
+				p := newContainer(t, "node-generic", m.IP())
 				defer p.close()
 
 			case "go":
 				n1, err := NewNode(NodeConf{
 					Namespace:     "/myns",
-					Name:          "nodegen",
+					Name:          "nodegeneric",
 					MasterAddress: m.IP() + ":11311",
 				})
 				require.NoError(t, err)
@@ -104,7 +104,7 @@ func TestNodeNodeKill(t *testing.T) {
 			require.NoError(t, err)
 			defer n.Close()
 
-			err = n.NodeKill("nodegen")
+			err = n.NodeKill("nodegeneric")
 			require.NoError(t, err)
 
 			time.Sleep(1 * time.Second)

diff --git a/testimages/node-gen/CMakeLists.txt → testimages/node-generic/CMakeLists.txt b/testimages/node-gen/CMakeLists.txt → testimages/node-generic/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 2.8.3)
 
-project(nodegen)
+project(nodegeneric)
 
 add_compile_options(-std=c++11 -Wall -Wextra)
 

diff --git a/testimages/node-gen/Dockerfile → testimages/node-generic/Dockerfile b/testimages/node-gen/Dockerfile → testimages/node-generic/Dockerfile
@@ -5,7 +5,7 @@ RUN apt update && apt install -y --no-install-recommends \
     make \
     && rm -rf /var/lib/apt/lists/*
 
-WORKDIR /catkin_ws/src/nodegen
+WORKDIR /catkin_ws/src/nodegeneric
 
 COPY CMakeLists.txt main.cpp package.xml ./
 

diff --git a/testimages/node-gen/main.cpp → testimages/node-generic/main.cpp b/testimages/node-gen/main.cpp → testimages/node-generic/main.cpp
@@ -1,7 +1,7 @@
 #include <ros/ros.h>
 
 int main(int argc, char **argv) {
-    ros::init(argc, argv, "nodegen");
+    ros::init(argc, argv, "nodegeneric");
     ros::NodeHandle node;
 
     ros::spin();

diff --git a/testimages/node-gen/package.xml → testimages/node-generic/package.xml b/testimages/node-gen/package.xml → testimages/node-generic/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
 
-  <name>nodegen</name>
+  <name>nodegeneric</name>
   <version>0.0.0</version>
   <description>empty</description>
 

diff --git a/testimages/node-gen/start.sh → testimages/node-generic/start.sh b/testimages/node-gen/start.sh → testimages/node-generic/start.sh
@@ -6,4 +6,4 @@ export ROS_NAMESPACE=/myns
 
 source /catkin_ws/install/setup.bash
 
-rosrun nodegen nodegen
+rosrun nodegeneric nodegeneric