X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Funit%2Ftest_session.c;h=4e659d5242b6af9f1fdf5ee91ac5e711159d33e7;hp=5db1e758fc8fcbe5641ca6b4498d99eb8fe875cb;hb=c109c263a5bf6c52d3a1cf27e26a784fb28fac07;hpb=a3707772aa2b063a321dd6d7dfb2ea369bc02c43

diff --git a/tests/unit/test_session.c b/tests/unit/test_session.c
index 5db1e758f..4e659d524 100644
--- a/tests/unit/test_session.c
+++ b/tests/unit/test_session.c
@@ -128,27 +128,32 @@ static void empty_session_list(void)
 static int create_one_session(char *name)
 {
 	int ret;
+	enum lttng_error_code ret_code;
+	struct ltt_session *session = NULL;
 
-	ret = session_create(name, geteuid(), getegid());
-	if (ret == LTTNG_OK) {
+	session_lock_list();
+	ret_code = session_create(name, geteuid(), getegid(), &session);
+	session_put(session);
+	if (ret_code == LTTNG_OK) {
 		/* Validate */
 		ret = find_session_name(name);
 		if (ret < 0) {
 			/* Session not found by name */
 			printf("session not found after creation\n");
-			return -1;
+			ret = -1;
 		} else {
 			/* Success */
-			return 0;
+			ret = 0;
 		}
 	} else {
-		if (ret == LTTNG_ERR_EXIST_SESS) {
+		if (ret_code == LTTNG_ERR_EXIST_SESS) {
 			printf("(session already exists) ");
 		}
-		return -1;
+		ret = -1;
 	}
 
-	return 0;
+	session_unlock_list();
+	return ret;
 }
 
 /*
@@ -211,20 +216,20 @@ end:
 	return ret;
 }
 
-void test_session_list(void)
+static void test_session_list(void)
 {
 	session_list = session_get_list();
 	ok(session_list != NULL, "Session list: not NULL");
 }
 
-void test_create_one_session(void)
+static void test_create_one_session(void)
 {
 	ok(create_one_session(SESSION1) == 0,
 	   "Create session: %s",
 	   SESSION1);
 }
 
-void test_validate_session(void)
+static void test_validate_session(void)
 {
 	struct ltt_session *tmp;
 
@@ -234,17 +239,23 @@ 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();
 }
 
-void test_destroy_session(void)
+static void test_destroy_session(void)
 {
 	struct ltt_session *tmp;
 
@@ -254,28 +265,48 @@ 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();
 }
 
-void test_duplicate_session(void)
+static void test_duplicate_session(void)
 {
 	ok(two_session_same_name() == 0,
 	   "Duplicate session creation");
 }
 
-void test_bogus_session_param(void)
+static void test_session_name_generation(void)
 {
-	ok(create_one_session(NULL) < 0,
-	   "Create session with bogus param: NULL should fail");
+	struct ltt_session *session = NULL;
+	enum lttng_error_code ret_code;
+	const char *expected_session_name_prefix = DEFAULT_SESSION_NAME;
 
-	ok(session_list_count() == 0,
-	   "Create session with bogus param: session list empty");
+	session_lock_list();
+	ret_code = session_create(NULL, geteuid(), getegid(), &session);
+	ok(ret_code == LTTNG_OK,
+		"Create session with a NULL name (auto-generate a name)");
+	if (!session) {
+		skip(1, "Skipping session name generation tests as session_create() failed.");
+		goto end;
+	}
+	diag("Automatically-generated session name: %s", *session->name ?
+		session->name : "ERROR");
+	ok(*session->name && !strncmp(expected_session_name_prefix, session->name,
+			sizeof(DEFAULT_SESSION_NAME) - 1),
+			"Auto-generated session name starts with %s",
+			DEFAULT_SESSION_NAME);
+end:
+	session_put(session);
+	session_unlock_list();
 }
 
-void test_large_session_number(void)
+static void test_large_session_number(void)
 {
 	int ret, i, failed = 0;
 	struct ltt_session *iter, *tmp;
@@ -340,7 +371,7 @@ int main(int argc, char **argv)
 
 	empty_session_list();
 
-	test_bogus_session_param();
+	test_session_name_generation();
 
 	test_large_session_number();