iox-eclipse-iceoryx#1030 Delay SIGTERM raising of RouDi in integratio…

…n tests
elBoberido · Sep 7, 2023 · 088ba10 · 088ba10
1 parent 9055315
commit 088ba10
Show file tree

Hide file tree

Showing 21 changed files with 22 additions and 21 deletions.
diff --git a/iceoryx_integrationtest/iceoryx_integrationtest/test_callback_example.py b/iceoryx_integrationtest/iceoryx_integrationtest/test_callback_example.py
@@ -42,7 +42,7 @@ def generate_test_description():
         'iox-roudi'
     )
     roudi_process = launch.actions.ExecuteProcess(
-        cmd=[roudi_executable, '-l', 'debug'],
+        cmd=[roudi_executable, '-l', 'trace', '--termination-delay', '5', '--kill-delay', '5'],
         env=proc_env, output='screen',
         sigterm_timeout='20')
 

diff --git a/iceoryx_integrationtest/iceoryx_integrationtest/test_callback_in_c_example.py b/iceoryx_integrationtest/iceoryx_integrationtest/test_callback_in_c_example.py
@@ -42,7 +42,7 @@ def generate_test_description():
         'iox-roudi'
     )
     roudi_process = launch.actions.ExecuteProcess(
-        cmd=[roudi_executable, '-l', 'debug'],
+        cmd=[roudi_executable, '-l', 'trace', '--termination-delay', '5', '--kill-delay', '5'],
         env=proc_env, output='screen',
         sigterm_timeout='20')
 

diff --git a/iceoryx_integrationtest/iceoryx_integrationtest/test_complexdata_example.py b/iceoryx_integrationtest/iceoryx_integrationtest/test_complexdata_example.py
@@ -56,7 +56,7 @@ def generate_test_description():
         'iox-roudi'
     )
     roudi_process = launch.actions.ExecuteProcess(
-        cmd=[roudi_executable, '-l', 'debug'],
+        cmd=[roudi_executable, '-l', 'trace', '--termination-delay', '5', '--kill-delay', '5'],
         env=proc_env, output='screen',
         sigterm_timeout='20')
 

diff --git a/iceoryx_integrationtest/iceoryx_integrationtest/test_ice_access_control_example.py b/iceoryx_integrationtest/iceoryx_integrationtest/test_ice_access_control_example.py
@@ -57,7 +57,7 @@ def generate_test_description():
         'iox-cpp-roudi-static-segments'
     )
     roudi_process = launch.actions.ExecuteProcess(
-        cmd=[roudi_executable, '-l', 'debug'],
+        cmd=[roudi_executable, '-l', 'trace', '--termination-delay', '5', '--kill-delay', '5'],
         env=proc_env, output='screen',
         sigterm_timeout='20')
 

diff --git a/iceoryx_integrationtest/iceoryx_integrationtest/test_icedelivery_example.py b/iceoryx_integrationtest/iceoryx_integrationtest/test_icedelivery_example.py
@@ -56,7 +56,7 @@ def generate_test_description():
         'iox-roudi'
     )
     roudi_process = launch.actions.ExecuteProcess(
-        cmd=[roudi_executable, '-l', 'debug'],
+        cmd=[roudi_executable, '-l', 'trace', '--termination-delay', '5', '--kill-delay', '5'],
         env=proc_env, output='screen',
         sigterm_timeout='20')
 

diff --git a/iceoryx_integrationtest/iceoryx_integrationtest/test_icedelivery_in_c_example.py b/iceoryx_integrationtest/iceoryx_integrationtest/test_icedelivery_in_c_example.py
@@ -41,7 +41,7 @@ def generate_test_description():
         'iox-roudi'
     )
     roudi_process = launch.actions.ExecuteProcess(
-        cmd=[roudi_executable, '-l', 'debug'],
+        cmd=[roudi_executable, '-l', 'trace', '--termination-delay', '5', '--kill-delay', '5'],
         env=proc_env, output='screen',
         sigterm_timeout='20')
 

diff --git a/iceoryx_integrationtest/iceoryx_integrationtest/test_icediscovery_example.py b/iceoryx_integrationtest/iceoryx_integrationtest/test_icediscovery_example.py
@@ -55,7 +55,7 @@ def generate_test_description():
         'iox-roudi'
     )
     roudi_process = launch.actions.ExecuteProcess(
-        cmd=[roudi_executable, '-l', 'debug'],
+        cmd=[roudi_executable, '-l', 'trace', '--termination-delay', '5', '--kill-delay', '5'],
         env=proc_env, output='screen',
         sigterm_timeout='20')
 

diff --git a/iceoryx_integrationtest/iceoryx_integrationtest/test_icediscovery_in_c_example.py b/iceoryx_integrationtest/iceoryx_integrationtest/test_icediscovery_in_c_example.py
@@ -55,7 +55,7 @@ def generate_test_description():
         'iox-roudi'
     )
     roudi_process = launch.actions.ExecuteProcess(
-        cmd=[roudi_executable, '-l', 'debug'],
+        cmd=[roudi_executable, '-l', 'trace', '--termination-delay', '5', '--kill-delay', '5'],
         env=proc_env, output='screen',
         sigterm_timeout='20')
 

diff --git a/iceoryx_integrationtest/iceoryx_integrationtest/test_icediscovery_monitoring.py b/iceoryx_integrationtest/iceoryx_integrationtest/test_icediscovery_monitoring.py
@@ -55,7 +55,7 @@ def generate_test_description():
         'iox-roudi'
     )
     roudi_process = launch.actions.ExecuteProcess(
-        cmd=[roudi_executable, '-l', 'debug'],
+        cmd=[roudi_executable, '-l', 'trace', '--termination-delay', '5', '--kill-delay', '5'],
         env=proc_env, output='screen',
         sigterm_timeout='20')
 

diff --git a/iceoryx_integrationtest/iceoryx_integrationtest/test_icehello_example.py b/iceoryx_integrationtest/iceoryx_integrationtest/test_icehello_example.py
@@ -41,7 +41,7 @@ def generate_test_description():
         'iox-roudi'
     )
     roudi_process = launch.actions.ExecuteProcess(
-        cmd=[roudi_executable, '-l', 'debug'],
+        cmd=[roudi_executable, '-l', 'trace', '--termination-delay', '5', '--kill-delay', '5'],
         env=proc_env, output='screen',
         sigterm_timeout='20')
 

diff --git a/iceoryx_integrationtest/iceoryx_integrationtest/test_iceoptions_example.py b/iceoryx_integrationtest/iceoryx_integrationtest/test_iceoptions_example.py
@@ -41,7 +41,7 @@ def generate_test_description():
         'iox-roudi'
     )
     roudi_process = launch.actions.ExecuteProcess(
-        cmd=[roudi_executable, '-l', 'debug'],
+        cmd=[roudi_executable, '-l', 'trace', '--termination-delay', '5', '--kill-delay', '5'],
         env=proc_env, output='screen',
         sigterm_timeout='20')
 

diff --git a/iceoryx_integrationtest/iceoryx_integrationtest/test_request_response_basic.py b/iceoryx_integrationtest/iceoryx_integrationtest/test_request_response_basic.py
@@ -55,7 +55,7 @@ def generate_test_description():
         'iox-roudi'
     )
     roudi_process = launch.actions.ExecuteProcess(
-        cmd=[roudi_executable, '-l', 'debug'],
+        cmd=[roudi_executable, '-l', 'trace', '--termination-delay', '5', '--kill-delay', '5'],
         env=proc_env, output='screen',
         sigterm_timeout='20')
 

diff --git a/iceoryx_integrationtest/iceoryx_integrationtest/test_request_response_in_c_basic.py b/iceoryx_integrationtest/iceoryx_integrationtest/test_request_response_in_c_basic.py
@@ -55,7 +55,7 @@ def generate_test_description():
         'iox-roudi'
     )
     roudi_process = launch.actions.ExecuteProcess(
-        cmd=[roudi_executable, '-l', 'debug'],
+        cmd=[roudi_executable, '-l', 'trace', '--termination-delay', '5', '--kill-delay', '5'],
         env=proc_env, output='screen',
         sigterm_timeout='20')
 

diff --git a/...ntegrationtest/iceoryx_integrationtest/test_request_response_in_c_listener_and_waitset.py b/...ntegrationtest/iceoryx_integrationtest/test_request_response_in_c_listener_and_waitset.py
@@ -55,7 +55,7 @@ def generate_test_description():
         'iox-roudi'
     )
     roudi_process = launch.actions.ExecuteProcess(
-        cmd=[roudi_executable, '-l', 'debug'],
+        cmd=[roudi_executable, '-l', 'trace', '--termination-delay', '5', '--kill-delay', '5'],
         env=proc_env, output='screen',
         sigterm_timeout='20')
 

diff --git a/iceoryx_integrationtest/iceoryx_integrationtest/test_request_response_listener.py b/iceoryx_integrationtest/iceoryx_integrationtest/test_request_response_listener.py
@@ -55,7 +55,7 @@ def generate_test_description():
         'iox-roudi'
     )
     roudi_process = launch.actions.ExecuteProcess(
-        cmd=[roudi_executable, '-l', 'debug'],
+        cmd=[roudi_executable, '-l', 'trace', '--termination-delay', '5', '--kill-delay', '5'],
         env=proc_env, output='screen',
         sigterm_timeout='20')
 

diff --git a/iceoryx_integrationtest/iceoryx_integrationtest/test_request_response_untyped.py b/iceoryx_integrationtest/iceoryx_integrationtest/test_request_response_untyped.py
@@ -55,7 +55,7 @@ def generate_test_description():
         'iox-roudi'
     )
     roudi_process = launch.actions.ExecuteProcess(
-        cmd=[roudi_executable, '-l', 'debug'],
+        cmd=[roudi_executable, '-l', 'trace', '--termination-delay', '5', '--kill-delay', '5'],
         env=proc_env, output='screen',
         sigterm_timeout='20')
 

diff --git a/iceoryx_integrationtest/iceoryx_integrationtest/test_roudi_startup_shutdown.py b/iceoryx_integrationtest/iceoryx_integrationtest/test_roudi_startup_shutdown.py
@@ -43,7 +43,7 @@ def generate_test_description():
         'iox-roudi'
     )
     roudi_process = launch.actions.ExecuteProcess(
-        cmd=[roudi_executable, '-l', 'debug'],
+        cmd=[roudi_executable, '-l', 'trace', '--termination-delay', '5', '--kill-delay', '5'],
         env=proc_env, output='screen',
         sigterm_timeout='20')
 

diff --git a/iceoryx_integrationtest/iceoryx_integrationtest/test_user_header_example.py b/iceoryx_integrationtest/iceoryx_integrationtest/test_user_header_example.py
@@ -48,7 +48,7 @@ def generate_test_description():
         'iox-roudi'
     )
     roudi_process = launch.actions.ExecuteProcess(
-        cmd=[roudi_executable, '-l', 'debug'],
+        cmd=[roudi_executable, '-l', 'trace', '--termination-delay', '5', '--kill-delay', '5'],
         env=proc_env, output='screen',
         sigterm_timeout='20')
 

diff --git a/iceoryx_integrationtest/iceoryx_integrationtest/test_waitset_example.py b/iceoryx_integrationtest/iceoryx_integrationtest/test_waitset_example.py
@@ -57,7 +57,7 @@ def generate_test_description():
         'iox-roudi'
     )
     roudi_process = launch.actions.ExecuteProcess(
-        cmd=[roudi_executable, '-l', 'debug'],
+        cmd=[roudi_executable, '-l', 'trace', '--termination-delay', '5', '--kill-delay', '5'],
         env=proc_env, output='screen',
         sigterm_timeout='20')
 

diff --git a/iceoryx_integrationtest/iceoryx_integrationtest/test_waitset_in_c_example.py b/iceoryx_integrationtest/iceoryx_integrationtest/test_waitset_in_c_example.py
@@ -57,7 +57,7 @@ def generate_test_description():
         'iox-roudi'
     )
     roudi_process = launch.actions.ExecuteProcess(
-        cmd=[roudi_executable, '-l', 'debug'],
+        cmd=[roudi_executable, '-l', 'trace', '--termination-delay', '5', '--kill-delay', '5'],
         env=proc_env, output='screen',
         sigterm_timeout='20')
 

diff --git a/iceoryx_posh/test/moduletests/test_roudi_process_manager.cpp b/iceoryx_posh/test/moduletests/test_roudi_process_manager.cpp
@@ -103,7 +103,7 @@ TEST_F(ProcessManager_test, RegisterSameProcessTwiceWithMonitoringWorks)
 
     EXPECT_TRUE(result1);
     EXPECT_TRUE(result2);
-    EXPECT_THAT(m_sut->registeredProcessCount(), Eq(2));
+    EXPECT_THAT(m_sut->registeredProcessCount(), Eq(1));
 }
 
 TEST_F(ProcessManager_test, RegisterSameProcessTwiceWithoutMonitoringWorks)
@@ -115,6 +115,7 @@ TEST_F(ProcessManager_test, RegisterSameProcessTwiceWithoutMonitoringWorks)
 
     EXPECT_TRUE(result1);
     EXPECT_TRUE(result2);
+    EXPECT_THAT(m_sut->registeredProcessCount(), Eq(1));
 }
 
 TEST_F(ProcessManager_test, UnregisterNonExistentProcessLeadsToError)