tests UPDATE uninstall modules after terminating the server

Prevents it from updating its context just to properly clean up and terminate.
CESNET · Jun 5, 2024 · 4681877 · 4681877
1 parent 8ab79d8
commit 4681877
Showing 1 changed file with 12 additions and 12 deletions.
diff --git a/tests/np2_test.c b/tests/np2_test.c
@@ -390,18 +390,6 @@ np2_glob_test_teardown(void **state, const char **modules)
     /* release context */
     sr_release_context(st->conn);
 
-    /* uninstall modules */
-    if (modules && (rc = sr_remove_modules(st->conn, modules, 0))) {
-        printf("sr_remove_modules() failed (%s)\n", sr_strerror(rc));
-        ret = 1;
-    }
-
-    /* disconnect */
-    if ((rc = sr_disconnect(st->conn))) {
-        printf("sr_disconnect() failed (%s)\n", sr_strerror(rc));
-        ret = 1;
-    }
-
 #ifdef NETOPEER2_LIB
     if (np2_server_test_stop()) {
         printf("np2_server_test_stop() failed\n");
@@ -431,6 +419,18 @@ np2_glob_test_teardown(void **state, const char **modules)
     }
 #endif
 
+    /* uninstall modules */
+    if (modules && (rc = sr_remove_modules(st->conn, modules, 0))) {
+        printf("sr_remove_modules() failed (%s)\n", sr_strerror(rc));
+        ret = 1;
+    }
+
+    /* disconnect */
+    if ((rc = sr_disconnect(st->conn))) {
+        printf("sr_disconnect() failed (%s)\n", sr_strerror(rc));
+        ret = 1;
+    }
+
     /* unset sysrepo environment variables */
     if (unsetenv("SYSREPO_REPOSITORY_PATH")) {
         SETUP_FAIL_LOG;