Moves to asserting expected output match outside of the process context

to account for cases where wait_for_output is maybe called after the expected output is already printed. Signed-off-by: Jaison Titus <[email protected]>
ros2 · Sep 18, 2020 · 8ebcb5f · 8ebcb5f
1 parent e2ce040
commit 8ebcb5f
Showing 1 changed file with 12 additions and 9 deletions.
diff --git a/ros2bag/test/test_record_qos_profiles.py b/ros2bag/test/test_record_qos_profiles.py
@@ -36,7 +36,6 @@
 PROFILE_PATH = Path(__file__).parent / 'resources'
 TEST_NODE = 'ros2bag_record_qos_profile_test_node'
 TEST_NAMESPACE = 'ros2bag_record_qos_profile'
-ERROR_STRING = r'\[ERROR] \[ros2bag]:'
 
 
 @pytest.mark.rostest
@@ -84,12 +83,13 @@ def test_qos_simple(self):
         expected_string_regex = re.compile(
             r'\[rosbag2_storage]: Opened database .* for READ_WRITE')
         with self.launch_bag_command(arguments=arguments) as bag_command:
-            condition_result = bag_command.wait_for_output(
+            bag_command.wait_for_output(
                 condition=lambda output: expected_string_regex.search(output) is not None,
                 timeout=5)
-            assert condition_result, print('ros2bag CLI did not produce the expected output')
         bag_command.wait_for_shutdown(timeout=5)
         assert bag_command.terminated
+        matches = expected_string_regex.search(bag_command.output)
+        assert matches, print('ros2bag CLI did not produce the expected output')
 
     def test_incomplete_qos_profile(self):
         profile_path = PROFILE_PATH / 'incomplete_qos_profile.yaml'
@@ -99,12 +99,13 @@ def test_incomplete_qos_profile(self):
         expected_string_regex = re.compile(
             r'\[rosbag2_storage]: Opened database .* for READ_WRITE')
         with self.launch_bag_command(arguments=arguments) as bag_command:
-            condition_result = bag_command.wait_for_output(
+            bag_command.wait_for_output(
                 condition=lambda output: expected_string_regex.search(output) is not None,
                 timeout=5)
-            assert condition_result, print('ros2bag CLI did not produce the expected output')
         bag_command.wait_for_shutdown(timeout=5)
         assert bag_command.terminated
+        matches = expected_string_regex.search(bag_command.output)
+        assert matches, print('ros2bag CLI did not produce the expected output')
 
     def test_incomplete_qos_duration(self):
         profile_path = PROFILE_PATH / 'incomplete_qos_duration.yaml'
@@ -114,12 +115,13 @@ def test_incomplete_qos_duration(self):
         expected_string_regex = re.compile(
             r'\[ERROR] \[ros2bag]: Time overrides must include both')
         with self.launch_bag_command(arguments=arguments) as bag_command:
-            condition_result = bag_command.wait_for_output(
+            bag_command.wait_for_output(
                 condition=lambda output: expected_string_regex.search(output) is not None,
                 timeout=5)
-            assert condition_result, print('ros2bag CLI did not produce the expected output')
         bag_command.wait_for_shutdown(timeout=5)
         assert bag_command.terminated
+        matches = expected_string_regex.search(bag_command.output)
+        assert matches, print('ros2bag CLI did not produce the expected output')
         assert bag_command.exit_code != launch_testing.asserts.EXIT_OK
 
     def test_nonexistent_qos_profile(self):
@@ -130,10 +132,11 @@ def test_nonexistent_qos_profile(self):
         expected_string_regex = re.compile(
             r'ros2 bag record: error: argument --qos-profile-overrides-path: can\'t open')
         with self.launch_bag_command(arguments=arguments) as bag_command:
-            condition_result = bag_command.wait_for_output(
+            bag_command.wait_for_output(
                 condition=lambda output: expected_string_regex.search(output) is not None,
                 timeout=5)
-            assert condition_result, print('ros2bag CLI did not produce the expected output')
         bag_command.wait_for_shutdown(timeout=5)
         assert bag_command.terminated
+        matches = expected_string_regex.search(bag_command.output)
+        assert matches, print('ros2bag CLI did not produce the expected output')
         assert bag_command.exit_code != launch_testing.asserts.EXIT_OK