X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fmi%2Ftest_mi;h=4c71fd8308604912c703bd864cb8c042c87cfb5d;hp=fa46b514ef90d98dfee68b220be3d9afd81eb4c1;hb=e563bbdb8fa6592790e9ac4e9db7d9decf022023;hpb=8d51ddbc52f9f5796f61fb661d47095c1ff1503f

diff --git a/tests/regression/tools/mi/test_mi b/tests/regression/tools/mi/test_mi
index fa46b514e..4c71fd830 100755
--- a/tests/regression/tools/mi/test_mi
+++ b/tests/regression/tools/mi/test_mi
@@ -63,7 +63,7 @@ source $TESTDIR/utils/utils.sh
 #Overwrite the lttng_bin to get mi output
 LTTNG_BIN="lttng --mi xml"
 
-#Global devlaration for simplification
+#Global declaration for simplification
 LTTNG=$TESTDIR/../src/bin/lttng/$LTTNG_BIN
 
 #Overwrite the default output for utils.sh command
@@ -140,12 +140,12 @@ function test_create_session ()
 
 	OUTPUT_FILE="create_session.xml"
 	OUTPUT_DEST=$OUTPUT_DIR/$OUTPUT_FILE
-	create_lttng_session $session_name $OUTPUT_DIR
+	create_lttng_session_ok $session_name $OUTPUT_DIR
 	$XML_VALIDATE $OUTPUT_DEST
 	ok $? "MI test: create session xsd validation"
 
 	#try to recreate a session. Expecting it to fail
-	create_lttng_session $session_name $OUTPUT_DIR true
+	create_lttng_session_fail $session_name $OUTPUT_DIR
 	$XML_VALIDATE $OUTPUT_DEST
 	ok $? "MI test: expecting fail create session xsd validation"
 	is_command_success $OUTPUT_DEST true
@@ -166,7 +166,7 @@ function test_destroy_session ()
 	#Test build up
 	OUTPUT_DEST=$DEVNULL
 	for (( i = 0; i < 3; i++ )); do
-		create_lttng_session ${session_name[$i]} $OUTPUT_DIR
+		create_lttng_session_ok ${session_name[$i]} $OUTPUT_DIR
 	done
 
 	OUTPUT_DEST=$OUTPUT_DIR/$OUTPUT_FILE
@@ -212,7 +212,7 @@ function test_list_sessions ()
 	#Test buid up
 	OUTPUT_DEST=$DEVNULL
 	for (( i = 0; i < 3; i++ )); do
-		create_lttng_session ${session_name[$i]} $OUTPUT_DIR
+		create_lttng_session_ok ${session_name[$i]} $OUTPUT_DIR
 	done
 
 	OUTPUT_DEST=$OUTPUT_DIR/$OUTPUT_FILE
@@ -242,24 +242,24 @@ function test_ust_channel ()
 
 	#Test buil up
 	OUTPUT_DEST=$DEVNULL
-	create_lttng_session $session_name $OUTPUT_DIR
+	create_lttng_session_ok $session_name $OUTPUT_DIR
 
 	#Test the enable_channel command
 	OUTPUT_DEST=$OUTPUT_DIR/$OUTPUT_FILE
-	enable_ust_lttng_channel $session_name ${channel_name[0]}
+	enable_ust_lttng_channel_ok $session_name ${channel_name[0]}
 	$XML_VALIDATE $OUTPUT_DEST
 	ok $? "Mi test: enable ust channel xsd validation"
 	is_command_success $OUTPUT_DEST false
 
 	#Expect the command to fail
-	enable_ust_lttng_channel $session_name ${channel_name[0]} true
+	enable_ust_lttng_channel_fail $session_name ${channel_name[0]}
 	$XML_VALIDATE $OUTPUT_DEST
 	ok $? "Mi test: fail enable ust channel xsd validation"
 	is_command_success $OUTPUT_DEST true
 
 	#Create two ust channel to test multiple disable
 	for (( i = 1; i < 3; i++ )); do
-		enable_ust_lttng_channel $session_name ${channel_name[$i]}
+		enable_ust_lttng_channel_ok $session_name ${channel_name[$i]}
 	done
 
 	#Test the disable_channel command
@@ -300,18 +300,18 @@ function test_ust_lttng_event ()
 
 	#Test build up
 	OUTPUT_DEST=$DEVNULL
-	create_lttng_session $session_name $OUTPUT_DIR
-	enable_ust_lttng_channel $session_name $channel_name
+	create_lttng_session_ok $session_name $OUTPUT_DIR
+	enable_ust_lttng_channel_ok $session_name $channel_name
 
 	OUTPUT_DEST=$OUTPUT_DIR/$OUTPUT_FILE
 	#Test the enable event for ust domain
-	enable_ust_lttng_event $session_name ${event[0]} $channel_name
+	enable_ust_lttng_event_ok $session_name ${event[0]} $channel_name
 	$XML_VALIDATE $OUTPUT_DEST
 	ok $? "Mi test: Enable_event for ust domain xsd validation"
 	is_command_success $OUTPUT_DEST false
 
 	#Try to reenable an enabled event. Should fail
-	enable_ust_lttng_event $session_name ${event[0]} $channel_name true
+	enable_ust_lttng_event_fail $session_name ${event[0]} $channel_name
 	$XML_VALIDATE $OUTPUT_DEST
 	ok $? "Mi test: Fail enable_event for ust domain xsd validation"
 	is_command_success $OUTPUT_DEST true
@@ -324,11 +324,11 @@ function test_ust_lttng_event ()
 	#Event[*] print all the element inside the array with the IFS in between
 	concat_event=$( IFS=$','; echo "${event[*]}" )
 
-	enable_ust_lttng_event $session_name $concat_event $channel_name true
+	enable_ust_lttng_event_fail $session_name $concat_event $channel_name
 	$XML_VALIDATE $OUTPUT_DEST
 	ok $? "Mi test: Multiple enable ust event with inside fail xsd validation"
 
-	#Check for 2 success = true et 1 false
+	#Check for 2 success = true and 1 success = false
 	extract_xml $OUTPUT_DEST $XPATH_ENABLE_EVENT_SUCCESS result
 	num_ocur=$(grep -o "true" <<< "$result" | wc -l)
 	test "$num_ocur" -eq "2"
@@ -372,12 +372,12 @@ function test_list_channel ()
 
 	#Test buid up
 	OUTPUT_DEST=$DEVNULL
-	create_lttng_session $session_name $OUTPUT_DIR
-	enable_ust_lttng_channel $session_name $channel_name
+	create_lttng_session_ok $session_name $OUTPUT_DIR
+	enable_ust_lttng_channel_ok $session_name $channel_name
 
 	#Enable ust and jul events
 	concat_event=$( IFS=$','; echo "${event[*]}" )
-	enable_ust_lttng_event $session_name $concat_event $channel_name
+	enable_ust_lttng_event_ok $session_name $concat_event $channel_name
 
 	#Begin testing
 	OUTPUT_DEST=$OUTPUT_DIR/$OUTPUT_FILE
@@ -402,7 +402,7 @@ function test_list_channel ()
 
 	#Add a channel and make sure we have 2 channel now
 	OUTPUT_DEST=$DEVNULL
-	enable_ust_lttng_channel $session_name $channel_name"a"
+	enable_ust_lttng_channel_ok $session_name $channel_name"a"
 
 	#Teardown
 	OUTPUT_DEST=$DEVNULL
@@ -419,12 +419,12 @@ function test_list_domain ()
 
 	#Test buid up
 	OUTPUT_DEST=$DEVNULL
-	create_lttng_session $session_name $OUTPUT_DIR
-	enable_ust_lttng_channel $session_name $channel_name
+	create_lttng_session_ok $session_name $OUTPUT_DIR
+	enable_ust_lttng_channel_ok $session_name $channel_name
 
 	#Enable ust and jul events
 	concat_event=$( IFS=$','; echo "${event[*]}" )
-	enable_ust_lttng_event $session_name $concat_event $channel_name
+	enable_ust_lttng_event_ok $session_name $concat_event $channel_name
 	enable_jul_lttng_event $session_name $concat_event $channel_name
 
 	#Begin testing
@@ -467,12 +467,12 @@ function test_list_session ()
 
 	#Test buid up
 	OUTPUT_DEST=$DEVNULL
-	create_lttng_session $session_name $OUTPUT_DIR
-	enable_ust_lttng_channel $session_name $channel_name
+	create_lttng_session_ok $session_name $OUTPUT_DIR
+	enable_ust_lttng_channel_ok $session_name $channel_name
 
 	#Enable ust and jul events
 	concat_event=$( IFS=$','; echo "${event[*]}" )
-	enable_ust_lttng_event $session_name $concat_event $channel_name
+	enable_ust_lttng_event_ok $session_name $concat_event $channel_name
 	enable_jul_lttng_event $session_name $concat_event $channel_name
 
 	#Begin testing
@@ -511,21 +511,25 @@ function test_list_ust_event ()
 	$XML_VALIDATE $OUTPUT_DEST
 	ok $? "Mi test: list ust event xsd validation"
 
-	#Extract events 3 events should be present
+	#Extract events
 	extract_xml $OUTPUT_DEST "$XPATH_LIST_UST_EVENT""/name/text()" result
 	num=$(echo "$result" | wc -l)
-	test "$num" -eq "3"
-	ok $? "Mi test: $num / 3 ust events discovered"
 
-	#Extract field from tp:tptest event. Expect 12
+	#Since the number of events is prone to change we only look for >= from a
+	#base number. An alternative would be to look for each events but this
+	#is complicated for nothing.
+	test "$num" -ge "5"
+	ok $? "Mi test: $num / 5 ust events discovered"
+
+	#Extract field from tp:tptest event. Expect >= to 12 because number of
+	#field is prone to change.
 	extract_xml $OUTPUT_DEST "$XPATH_LIST_UST_EVENT""[./name = 'tp:tptest']/event_fields/event_field/name/text()" result
 	num=$(echo "$result" | wc -l)
-	test "$num" -eq "12"
+	test "$num" -ge "12"
 	ok $? "Mi test: $num / 12 ust event fields discovered"
 
-	#Wait for last forked process
-	wait $!
-
+	#Wait for all background processes
+	wait
 }
 
 function test_start_stop () {
@@ -536,12 +540,12 @@ function test_start_stop () {
 
 	#Test buid up
 	OUTPUT_DEST=$DEVNULL
-	create_lttng_session $session_name $OUTPUT_DIR
+	create_lttng_session_ok $session_name $OUTPUT_DIR
 
 	#Test fail command
 	#No channel enable start command should return element success false
 	OUTPUT_DEST=$OUTPUT_DIR/$OUTPUT_FILE
-	start_lttng_tracing $session_name 1
+	start_lttng_tracing_fail $session_name
 	$XML_VALIDATE $OUTPUT_DEST
 	ok $? "Mi test: failed start xsd validation"
 
@@ -552,11 +556,11 @@ function test_start_stop () {
 
 	#Enable a channel to test success
 	OUTPUT_DEST=$DEVNULL
-	enable_ust_lttng_channel $session_name $channel_name
+	enable_ust_lttng_channel_ok $session_name $channel_name
 
 	#Start tracing
 	OUTPUT_DEST=$OUTPUT_DIR/$OUTPUT_FILE
-	start_lttng_tracing $session_name
+	start_lttng_tracing_ok $session_name
 	$XML_VALIDATE $OUTPUT_DEST
 	ok $? "Mi test: start xsd validation"
 
@@ -603,7 +607,6 @@ function test_start_stop () {
 	#Teardown
 	OUTPUT_DEST=$DEVNULL
 	destroy_lttng_sessions
-
 }
 
 function test_snapshot () {