Fix: move set base_path of session to URI configuration

[lttng-tools.git] / tests / unit / test_session.c

diff --git a/tests/unit/test_session.c b/tests/unit/test_session.c
index fa3e367d20b121f5a7da4dfbb8e73a041d483eaf..d0111780993ec8d0621ff9a2cd03adf629987502 100644 (file)
--- a/tests/unit/test_session.c
+++ b/tests/unit/test_session.c
@@ -141,21 +141,17 @@ static int create_one_session(char *name)
                        /* Session not found by name */
                        printf("session not found after creation\n");
                        ret = -1;
-                       goto end;
                } else {
                        /* Success */
                        ret = 0;
-                       goto end;
                }
        } else {
                if (ret_code == LTTNG_ERR_EXIST_SESS) {
                        printf("(session already exists) ");
                }
                ret = -1;
-               goto end;
        }
-       ret = 0;
-end:
+
        session_unlock_list();
        return ret;
 }
@@ -243,13 +239,19 @@ void test_validate_session(void)
        ok(tmp != NULL,
           "Validating session: session found");
 
-       ok(tmp->kernel_session == NULL &&
-          strlen(tmp->name),
-          "Validating session: basic sanity check");
+       if (tmp) {
+               ok(tmp->kernel_session == NULL &&
+                  strlen(tmp->name),
+                  "Validating session: basic sanity check");
+       } else {
+               skip(1, "Skipping session validation check as session was not found");
+               goto end;
+       }
 
        session_lock(tmp);
        session_unlock(tmp);
        session_put(tmp);
+end:
        session_unlock_list();
 }
 
@@ -263,9 +265,13 @@ void test_destroy_session(void)
        ok(tmp != NULL,
           "Destroying session: session found");
 
-       ok(destroy_one_session(tmp) == 0,
-          "Destroying session: %s destroyed",
-          SESSION1);
+       if (tmp) {
+               ok(destroy_one_session(tmp) == 0,
+                  "Destroying session: %s destroyed",
+                  SESSION1);
+       } else {
+               skip(1, "Skipping session destruction as it was not found");
+       }
        session_unlock_list();
 }