commit a114cb14fe94f41cc30bfc24741a307be9a67744
author Jan Kundrát <jan.kundrat@cesnet.cz> Fri May 22 15:44:27 2020 +0200
committer Jan Kundrát <jan.kundrat@cesnet.cz> Thu May 28 11:35:58 2020 +0200
tree 2560741fcacb3ea5494f248eed829d3a7c0951a9
parent ce69bc53966d8ab34c17f2bc6f923ed23f6822f6

tests: register kill_daemons as a resource cleanup complementing start_daemons

That way daemons get killed even after running just the Python test.

Change-Id: I55447e4381979701b50e8fe14e81f7dd110d78d8

CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index abbe97b..4aeab5e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -222,6 +222,7 @@
         set_tests_properties(setup_netopeer PROPERTIES FIXTURES_SETUP netopeer_configured)
         set_tests_properties(start_daemons PROPERTIES FIXTURES_REQUIRED netopeer_configured FIXTURES_SETUP netopeer_running)
         set_property(TEST kill_daemons APPEND PROPERTY DEPENDS example-schema_cleanup)
+        set_property(TEST kill_daemons APPEND PROPERTY FIXTURES_CLEANUP netopeer_running)
     endfunction()
 
     function(cli_test name)
@@ -298,8 +299,8 @@
         configure_file(${CMAKE_CURRENT_SOURCE_DIR}/tests/python_netconfaccess.py
             ${CMAKE_CURRENT_BINARY_DIR}/tests_python_netconfaccess.py @ONLY)
         add_test(NAME test_netconf_cli_py COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/tests_python_netconfaccess.py)
-        set_tests_properties(test_netconf_cli_py PROPERTIES FIXTURES_REQUIRED netopeer_running RESOURCE_LOCK sysrepo DEPENDS example-schema_cleanup)
-        set_property(TEST kill_daemons APPEND PROPERTY DEPENDS test_netconf_cli_py)
+        set_tests_properties(test_netconf_cli_py PROPERTIES RESOURCE_LOCK sysrepo)
+        set_property(TEST test_netconf_cli_py APPEND PROPERTY FIXTURES_REQUIRED netopeer_running)
 
         set(sanitizer_active OFF)
         # FIXME: this just sucks. The detection is very unreliable (one could use something like