From 70c94ef2b67aacc87256cbc098834eb3aa48263e Mon Sep 17 00:00:00 2001 From: Michel Hidalgo Date: Wed, 13 May 2020 16:39:37 -0300 Subject: [PATCH] Do not use ros2cli daemon in generate_policy tests. Signed-off-by: Michel Hidalgo --- .../security/verbs/test_generate_policy.py | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/sros2/test/sros2/commands/security/verbs/test_generate_policy.py b/sros2/test/sros2/commands/security/verbs/test_generate_policy.py index 8d31c7cd..a1a70e31 100644 --- a/sros2/test/sros2/commands/security/verbs/test_generate_policy.py +++ b/sros2/test/sros2/commands/security/verbs/test_generate_policy.py @@ -42,7 +42,11 @@ def test_generate_policy_topics(): # Generate the policy for the running node assert cli.main( - argv=['security', 'generate_policy', os.path.join(tmpdir, 'test-policy.xml')]) == 0 + argv=['security', + 'generate_policy', + '--no-daemon', + '--spin-time', '1', + os.path.join(tmpdir, 'test-policy.xml')]) == 0 finally: node.destroy_node() rclpy.shutdown(context=context) @@ -94,7 +98,11 @@ def test_generate_policy_services(): # Generate the policy for the running node assert cli.main( - argv=['security', 'generate_policy', os.path.join(tmpdir, 'test-policy.xml')]) == 0 + argv=['security', + 'generate_policy', + '--no-daemon', + '--spin-time', '1', + os.path.join(tmpdir, 'test-policy.xml')]) == 0 finally: node.destroy_node() rclpy.shutdown(context=context) @@ -131,7 +139,10 @@ def test_generate_policy_services(): def test_generate_policy_no_nodes(capsys): with tempfile.TemporaryDirectory() as tmpdir: assert cli.main(argv=[ - 'security', 'generate_policy', os.path.join(tmpdir, 'test-policy.xml')]) != 0 + 'security', + 'generate_policy', + '--no-daemon', + os.path.join(tmpdir, 'test-policy.xml')]) != 0 stderr = capsys.readouterr().err.strip() assert stderr == 'No nodes detected in the ROS graph. No policy file was generated.'