X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fmi%2Ftest_mi;h=5bd29ed4d3563cc24144539ebae3763723730d21;hb=1c240f7e94d00bada25224eedb697064f9abbccb;hp=5d2d4513f4d0f486a9043b8f5191604e76611702;hpb=96340a015194538227efcbc654ec02c2ed9961ce;p=lttng-tools.git

diff --git a/tests/regression/tools/mi/test_mi b/tests/regression/tools/mi/test_mi
index 5d2d4513f..5bd29ed4d 100755
--- a/tests/regression/tools/mi/test_mi
+++ b/tests/regression/tools/mi/test_mi
@@ -27,8 +27,8 @@ RELAYD_BIN="lttng-relayd"
 TESTAPP_PATH="$TESTDIR/utils/testapp"
 TESTAPP_NAME="gen-ust-events"
 TESTAPP_BIN="$TESTAPP_PATH/$TESTAPP_NAME/$TESTAPP_NAME"
-NR_USEC_WAIT=10000
-
+NR_USEC_WAIT=0
+NR_ITER=10000
 
 #Temp file output
 OUTPUT_DIR=$(mktemp -d)
@@ -151,7 +151,7 @@ function test_create_session ()
 	is_command_success $OUTPUT_DEST true
 
 	OUTPUT_DEST=$DEVNULL
-	destroy_lttng_session $session_name
+	destroy_lttng_session_ok $session_name
 }
 
 function test_destroy_session ()
@@ -170,7 +170,7 @@ function test_destroy_session ()
 	done
 
 	OUTPUT_DEST=$OUTPUT_DIR/$OUTPUT_FILE
-	destroy_lttng_session ${session_name[0]}
+	destroy_lttng_session_ok ${session_name[0]}
 	$XML_VALIDATE $OUTPUT_DEST
 	ok $? "MI test: destroy session ${session_name[0]} xsd validation"
 
@@ -191,7 +191,7 @@ function test_destroy_session ()
 	ok $? "Mi test: $num / 2 sessions discovered"
 
 	#Verify that if no session is present command fail and mi report it.
-	destroy_lttng_session ${session_name[0]} 1
+	destroy_lttng_session_fail ${session_name[0]}
 	$XML_VALIDATE $OUTPUT_DEST
 	ok $? "MI test: failing destroy session ${session_name[0]} xsd validation"
 	extract_xml $OUTPUT_DEST $XPATH_COMMAND_SUCCESS result
@@ -500,14 +500,25 @@ function test_list_session ()
 
 function test_list_ust_event ()
 {
+	local file_sync_after_first=$(mktemp -u)
+	local file_sync_before_last=$(mktemp -u)
+
 	OUTPUT_FILE="list_ust_event.xml"
 
 	#Test buid up
 	OUTPUT_DEST=$OUTPUT_DIR/$OUTPUT_FILE
 
 	#Begin testing
-	$TESTAPP_BIN $NR_USEC_WAIT & 2>/dev/null
+	$TESTAPP_BIN $NR_ITER $NR_USEC_WAIT ${file_sync_after_first} ${file_sync_before_last} & 2>/dev/null
+
+	while [ ! -f "${file_sync_after_first}" ]; do
+		sleep 0.5
+	done
+
 	list_lttng_with_opts "-u -f"
+
+	touch ${file_sync_before_last}
+
 	$XML_VALIDATE $OUTPUT_DEST
 	ok $? "Mi test: list ust event xsd validation"
 
@@ -530,6 +541,9 @@ function test_list_ust_event ()
 
 	#Wait for all background processes
 	wait
+
+	rm -f ${file_sync_after_first}
+	rm -f ${file_sync_before_last}
 }
 
 function test_start_stop () {
@@ -622,7 +636,7 @@ function test_snapshot () {
 	#Test fail command
 	#No channel enable start command should return element success false
 	OUTPUT_DEST=$OUTPUT_DIR/$OUTPUT_FILE
-    lttng_snapshot_add_output $session_name $snapshot_path
+	lttng_snapshot_add_output_ok $session_name $snapshot_path
 	$XML_VALIDATE $OUTPUT_DEST
 	ok $? "Mi test: snapshot xsd validation"
 
@@ -655,7 +669,7 @@ function test_snapshot () {
 	ok $? "Mi test: snapshot list extracted snapshot: $result expected: $snapshot_name"
 
 	#Test del output
-	lttng_snapshot_del_output $session_name $snapshot_id
+	lttng_snapshot_del_output_ok $session_name $snapshot_id
 	$XML_VALIDATE $OUTPUT_DEST
 	ok $? "Mi test: snapshot delete xsd validation"
 
@@ -674,7 +688,7 @@ function test_snapshot () {
 	ok $? "Mi test: snapshot del extracted snapshot id: $result expected: $session_name"
 
 	#Test fail on delete command
-	lttng_snapshot_del_output $session_name $snapshot_id 1
+	lttng_snapshot_del_output_fail $session_name $snapshot_id
 	$XML_VALIDATE $OUTPUT_DEST
 	ok $? "Mi test: snapshot delete xsd validation"