X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Funit%2Ftest_session.c;h=a0e84e9eadeae103b20be81697629d90d7ddf92e;hp=41c907c1876a180b451b00c12be1f55a2cb9545d;hb=ad7c9c188f0e6336577ccdc7e6e0aea409a88a9d;hpb=5d2e1e66a968d9e555f9b8b00d0589ebfaf3de32

diff --git a/tests/unit/test_session.c b/tests/unit/test_session.c
index 41c907c18..a0e84e9ea 100644
--- a/tests/unit/test_session.c
+++ b/tests/unit/test_session.c
@@ -29,26 +29,27 @@
 #include <tap/tap.h>
 
 #include <bin/lttng-sessiond/session.h>
+#include <bin/lttng-sessiond/ust-app.h>
 #include <common/sessiond-comm/sessiond-comm.h>
 #include <common/common.h>
 
 #define SESSION1 "test1"
 
-/* This path will NEVER be created in this test */
-#define PATH1 "/tmp/.test-junk-lttng"
-
 #define MAX_SESSIONS 10000
 #define RANDOM_STRING_LEN	11
 
 /* Number of TAP tests in this file */
-#define NUM_TESTS 12
+#define NUM_TESTS 11
 
 static struct ltt_session_list *session_list;
 
-/* For lttngerr.h */
+/* For error.h */
 int lttng_opt_quiet = 1;
 int lttng_opt_verbose = 0;
 
+int ust_consumerd32_fd;
+int ust_consumerd64_fd;
+
 static const char alphanum[] =
 	"0123456789"
 	"ABCDEFGHIJKLMNOPQRSTUVWXYZ"
@@ -118,11 +119,11 @@ static void empty_session_list(void)
 /*
  * Test creation of 1 session
  */
-static int create_one_session(char *name, char *path)
+static int create_one_session(char *name)
 {
 	int ret;
 
-	ret = session_create(name, path, geteuid(), getegid());
+	ret = session_create(name, geteuid(), getegid());
 	if (ret == LTTNG_OK) {
 		/* Validate */
 		ret = find_session_name(name);
@@ -150,15 +151,14 @@ static int create_one_session(char *name, char *path)
 static int destroy_one_session(struct ltt_session *session)
 {
 	int ret;
+	char session_name[NAME_MAX];
 
-	ret = session_destroy(session);
+	strncpy(session_name, session->name, sizeof(session->name));
+	session_name[sizeof(session_name) - 1] = '\0';
 
+	ret = session_destroy(session);
 	if (ret == LTTNG_OK) {
-		/* Validate */
-		if (session == NULL) {
-			return 0;
-		}
-		ret = find_session_name(session->name);
+		ret = find_session_name(session_name);
 		if (ret < 0) {
 			/* Success, -1 means that the sesion is NOT found */
 			return 0;
@@ -180,7 +180,7 @@ static int two_session_same_name(void)
 	int ret;
 	struct ltt_session *sess;
 
-	ret = create_one_session(SESSION1, PATH1);
+	ret = create_one_session(SESSION1);
 	if (ret < 0) {
 		/* Fail */
 		return -1;
@@ -204,7 +204,7 @@ void test_session_list(void)
 
 void test_create_one_session(void)
 {
-	ok(create_one_session(SESSION1, PATH1) == 0,
+	ok(create_one_session(SESSION1) == 0,
 	   "Create session: %s",
 	   SESSION1);
 }
@@ -219,7 +219,6 @@ void test_validate_session(void)
 	   "Validating session: session found");
 
 	ok(tmp->kernel_session == NULL &&
-	   strlen(tmp->path) &&
 	   strlen(tmp->name),
 	   "Validating session: basic sanity check");
 
@@ -249,12 +248,8 @@ void test_duplicate_session(void)
 
 void test_bogus_session_param(void)
 {
-	ok(create_one_session(NULL, NULL) < 0,
-	   "Create session with bogus param: NULL, NULL should fail");
-
-	ok(create_one_session(NULL, PATH1) < 0,
-	   "Create session with bogus param: NULL, %s should fail",
-	   PATH1);
+	ok(create_one_session(NULL) < 0,
+	   "Create session with bogus param: NULL should fail");
 
 	ok(session_list_count() == 0,
 	   "Create session with bogus param: session list empty");
@@ -267,7 +262,7 @@ void test_large_session_number(void)
 
 	for (i = 0; i < MAX_SESSIONS; i++) {
 		char *tmp_name = get_random_string();
-		ret = create_one_session(tmp_name, PATH1);
+		ret = create_one_session(tmp_name);
 		if (ret < 0) {
 			diag("session %d (name: %s) creation failed", i, tmp_name);
 			++failed;
@@ -284,7 +279,7 @@ void test_large_session_number(void)
 		cds_list_for_each_entry_safe(iter, tmp, &session_list->head, list) {
 			ret = destroy_one_session(iter);
 			if (ret < 0) {
-				diag("session %d (name: %s) destroy failed", i, iter->name);
+				diag("session %d destroy failed", i);
 				++failed;
 			}
 		}
@@ -297,10 +292,10 @@ void test_large_session_number(void)
 
 int main(int argc, char **argv)
 {
-	diag("Sessions unit tests");
-
 	plan_tests(NUM_TESTS);
 
+	diag("Sessions unit tests");
+
 	test_session_list();
 
 	test_create_one_session();