commit c54092817c964e3fe558b0c23d4f0ed1c3c5e4c5
author Jan Kundrát <jan.kundrat@cesnet.cz> Thu May 28 14:31:50 2020 +0200
committer Gerrit Code Review <gerrit@gerrit.cesnet.cz> Thu May 28 14:31:50 2020 +0200
tree 1c4dc7391efec4aa676a8f3add2454932f3f990a
parent 440dc480571f468d6b62a3047ef68428bf0f15b3
parent 40735fd27a52680538740003923ba963c6c023a1

Merge changes I0d08d82a,Ie72ef296,I55447e43

* changes:
  Python: use the same order of definitions as in the abstract base class
  tests: run the Python test suite with the example-module enabled
  tests: register kill_daemons as a resource cleanup complementing start_daemons

CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index abbe97b..99262a3 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,9 @@
         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_property(TEST test_netconf_cli_py APPEND PROPERTY FIXTURES_REQUIRED example-schema_setup)
 
         set(sanitizer_active OFF)
         # FIXME: this just sucks. The detection is very unreliable (one could use something like

src/python_netconf.cpp

diff --git a/src/python_netconf.cpp b/src/python_netconf.cpp
index 49a4339..76dc559 100644
--- a/src/python_netconf.cpp
+++ b/src/python_netconf.cpp
@@ -68,11 +68,11 @@
                     "server"_a, "port"_a=830, "username"_a, "interactive_auth"_a)
             .def("getItems", &NetconfAccess::getItems, "xpath"_a)
             .def("setLeaf", &NetconfAccess::setLeaf, "xpath"_a, "value"_a)
-            .def("commitChanges", &NetconfAccess::commitChanges)
-            .def("executeRpc", &NetconfAccess::executeRpc, "rpc"_a, "input"_a=DatastoreAccess::Tree{})
-            .def("createListInstance", &NetconfAccess::createListInstance, "xpath"_a)
-            .def("deleteListInstance", &NetconfAccess::deleteListInstance, "xpath"_a)
             .def("createPresenceContainer", &NetconfAccess::createPresenceContainer, "xpath"_a)
             .def("deletePresenceContainer", &NetconfAccess::deletePresenceContainer, "xpath"_a)
+            .def("createListInstance", &NetconfAccess::createListInstance, "xpath"_a)
+            .def("deleteListInstance", &NetconfAccess::deleteListInstance, "xpath"_a)
+            .def("executeRpc", &NetconfAccess::executeRpc, "rpc"_a, "input"_a=DatastoreAccess::Tree{})
+            .def("commitChanges", &NetconfAccess::commitChanges)
             ;
 }