X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fmi%2Ftest_mi;h=5ae71c745f0911ef59155d1f7bf48462f4250313;hp=cb0470bb76afcf91fa1097df13c19d4709625a70;hb=a4c305246c4b8021fa1681076326731349a1cd17;hpb=654f9f5e49aae2669d8ae771650b5e2dce5d660f

diff --git a/tests/regression/tools/mi/test_mi b/tests/regression/tools/mi/test_mi
index cb0470bb7..5ae71c745 100755
--- a/tests/regression/tools/mi/test_mi
+++ b/tests/regression/tools/mi/test_mi
@@ -20,8 +20,6 @@ TEST_DESC="Machine interface testing"
 CURDIR=$(dirname $0)/
 TESTDIR=$CURDIR/../../../
 XSD_PATH=$TESTDIR/../src/common/mi-lttng-3.0.xsd
-SESSIOND_BIN="lttng-sessiond"
-RELAYD_BIN="lttng-relayd"
 
 #Test app for ust event
 TESTAPP_PATH="$TESTDIR/utils/testapp"
@@ -32,7 +30,7 @@ NR_ITER=10000
 
 #Temp file output
 OUTPUT_DIR=$(mktemp -d)
-FOO_LOAD_DIR=$(mktemp -d)
+SESSIOND_LOAD_DIR=$(mktemp -d)
 OUTPUT_FILE="default.xml"
 
 #Path to custom xml utilities
@@ -40,26 +38,26 @@ XML_VALIDATE="$CURDIR/validate_xml $XSD_PATH"
 XML_EXTRACT="$CURDIR/extract_xml"
 XML_NODE_CHECK="$CURDIR/extract_xml -e"
 
-XPATH_CMD_OUTPUT="//command/output"
-XPATH_COMMAND_SUCCESS="/command/success/text()"
-XPATH_SESSION="$XPATH_CMD_OUTPUT/sessions/session"
-XPATH_ENABLE_CHANNEL_NAME="$XPATH_CMD_OUTPUT/channels/channel/name/text()"
-XPATH_ENABLE_EVENT_SUCCESS="$XPATH_CMD_OUTPUT/events/event/success/text()"
-XPATH_DISABLE_EVENT_SUCCESS="$XPATH_CMD_OUTPUT/channel/events/event/success/text()"
-XPATH_LIST_DOMAIN="$XPATH_CMD_OUTPUT/sessions/session/domains/domain"
-XPATH_LIST_CHANNEL="$XPATH_CMD_OUTPUT/sessions/session/domains/domain/channels/channel"
-XPATH_LIST_UST_EVENT="$XPATH_CMD_OUTPUT/domains/domain[./type ='UST']/pids/pid/events/event"
-XPATH_SNAPSHOT_ADD_SNAPSHOT="$XPATH_CMD_OUTPUT/snapshot_action[./name = 'add-output']/output"
-XPATH_SNAPSHOT_LIST="$XPATH_CMD_OUTPUT/snapshot_action[./name = 'list-output']/output"
-XPATH_SNAPSHOT_DEL="$XPATH_CMD_OUTPUT/snapshot_action[./name = 'del-output']/output"
-XPATH_TRACK_UNTRACK_PID="$XPATH_CMD_OUTPUT/targets/pid_target"
-XPATH_PID_TRACKER="$XPATH_CMD_OUTPUT/sessions/session/domains/domain/trackers/pid_tracker"
+XPATH_CMD_OUTPUT="//lttng:command/lttng:output"
+XPATH_COMMAND_SUCCESS="/lttng:command/lttng:success/text()"
+XPATH_SESSION="$XPATH_CMD_OUTPUT/lttng:sessions/lttng:session"
+XPATH_ENABLE_CHANNEL_NAME="$XPATH_CMD_OUTPUT/lttng:channels/lttng:channel/lttng:name/text()"
+XPATH_ENABLE_EVENT_SUCCESS="$XPATH_CMD_OUTPUT/lttng:events/lttng:event/lttng:success/text()"
+XPATH_DISABLE_EVENT_SUCCESS="$XPATH_CMD_OUTPUT/lttng:channel/lttng:events/lttng:event/lttng:success/text()"
+XPATH_LIST_DOMAIN="$XPATH_CMD_OUTPUT/lttng:sessions/lttng:session/lttng:domains/lttng:domain"
+XPATH_LIST_CHANNEL="$XPATH_CMD_OUTPUT/lttng:sessions/lttng:session/lttng:domains/lttng:domain/lttng:channels/lttng:channel"
+XPATH_LIST_UST_EVENT="$XPATH_CMD_OUTPUT/lttng:domains/lttng:domain[./lttng:type ='UST']/lttng:pids/lttng:pid/lttng:events/lttng:event"
+XPATH_SNAPSHOT_ADD_SNAPSHOT="$XPATH_CMD_OUTPUT/lttng:snapshot_action[./lttng:name = 'add-output']/lttng:output"
+XPATH_SNAPSHOT_LIST="$XPATH_CMD_OUTPUT/lttng:snapshot_action[./lttng:name = 'list-output']/lttng:output"
+XPATH_SNAPSHOT_DEL="$XPATH_CMD_OUTPUT/lttng:snapshot_action[./lttng:name = 'del-output']/lttng:output"
+XPATH_TRACK_UNTRACK_PID="$XPATH_CMD_OUTPUT/lttng:targets/lttng:pid_target"
+XPATH_PID_TRACKER="$XPATH_CMD_OUTPUT/lttng:sessions/lttng:session/lttng:domains/lttng:domain/lttng:trackers/lttng:pid_tracker"
 
 DEVNULL=/dev/null 2>&1
 
 DIR=$(readlink -f $TESTDIR)
 
-NUM_TESTS=222
+NUM_TESTS=230
 
 source $TESTDIR/utils/utils.sh
 
@@ -111,6 +109,7 @@ function is_command_success ()
 
 	local xpath=$XPATH_COMMAND_SUCCESS
 
+	echo $xml
 	#Extract the success element
 	#expect false
 	extract_xml $OUTPUT_DEST $XPATH_COMMAND_SUCCESS result
@@ -131,10 +130,10 @@ function is_command_success ()
 
 function mi_print_version ()
 {
-	local opt=$2
 	local output_path=$1
+	local opt=$2
 
-	$LTTNG version $opt > $1
+	$LTTNG version $opt > $output_path
 	ok $? "MI test: Lttng version"
 
 }
@@ -189,7 +188,7 @@ function test_destroy_session ()
 	ok $? "MI test: destroy session ${session_name[0]} xsd validation"
 
 	#Verify that we destroyed the good session
-	extract_xml $OUTPUT_DEST $XPATH_SESSION"/name/text()" result
+	extract_xml $OUTPUT_DEST $XPATH_SESSION"/lttng:name/text()" result
 	test "$result" = "${session_name[0]}"
 	ok $? "Mi test: deleted session: $result expected: ${session_name[0]}"
 
@@ -199,7 +198,7 @@ function test_destroy_session ()
 	ok $? "MI test: destroy all session xsd validation"
 
 	#Verify that we destroyed 2 sessions
-	extract_xml $OUTPUT_DEST $XPATH_SESSION"/name/text()" result
+	extract_xml $OUTPUT_DEST $XPATH_SESSION"/lttng:name/text()" result
 	num=$(echo "$result" | wc -l)
 	test "$num" -eq "2"
 	ok $? "Mi test: $num / 2 sessions discovered"
@@ -235,7 +234,7 @@ function test_list_sessions ()
 	ok $? "Mi test: list sessions xsd validation"
 
 	#We should have 3 session
-	extract_xml $OUTPUT_DEST $XPATH_SESSION"/name/text()" result
+	extract_xml $OUTPUT_DEST $XPATH_SESSION"/lttng:name/text()" result
 	num=$(echo "$result" | wc -l)
 	test "$num" -eq "3"
 	ok $? "Mi test: $num / 3 sessions discovered"
@@ -245,6 +244,28 @@ function test_list_sessions ()
 	destroy_lttng_sessions
 }
 
+function test_list_session_long_path ()
+{
+	local session_name="session_long_path"
+
+	output_basedir=$OUTPUT_DIR/$(randstring 254 0)
+	mkdir -p ${output_basedir}
+
+	OUTPUT_FILE="list_sessions.xml"
+
+	#Test build up
+	OUTPUT_DEST=$DEVNULL
+	create_lttng_session_ok $session_name ${output_basedir}
+
+	OUTPUT_DEST=${output_basedir}/$OUTPUT_FILE
+	list_lttng_with_opts
+	$XML_VALIDATE $OUTPUT_DEST
+	ok $? "Mi test: list session with long path xsd validation"
+
+	#Teardown
+	OUTPUT_DEST=$DEVNULL
+	destroy_lttng_sessions
+}
 function test_ust_channel ()
 {
 	local session_name="testsession"
@@ -400,13 +421,13 @@ function test_list_channel ()
 	ok $? "Mi test: list channel xsd validation"
 
 	#Expect 1 domain: UST
-	extract_xml $OUTPUT_DEST $XPATH_LIST_DOMAIN"/type/text()" result
+	extract_xml $OUTPUT_DEST $XPATH_LIST_DOMAIN"/lttng:type/text()" result
 	num=$(echo "$result" | wc -l)
 	test "$num" -eq "1"
 	ok $? "Mi test: $num / 1 domains discovered"
 
 	#Expect 1 channel: test
-	extract_xml $OUTPUT_DEST $XPATH_LIST_CHANNEL"/name/text()" result
+	extract_xml $OUTPUT_DEST $XPATH_LIST_CHANNEL"/lttng:name/text()" result
 	num=$(echo "$result" | wc -l)
 	test "$num" -eq "1"
 	ok $? "Mi test: $num / 1 channel discovered"
@@ -448,7 +469,7 @@ function test_list_domain ()
 	ok $? "Mi test: list domain xsd validation"
 
 	#Expect 2 domain: Jul and UST
-	extract_xml $OUTPUT_DEST $XPATH_LIST_DOMAIN"/type/text()" result
+	extract_xml $OUTPUT_DEST $XPATH_LIST_DOMAIN"/lttng:type/text()" result
 	num=$(echo "$result" | wc -l)
 	test "$num" -eq "2"
 	ok $? "Mi test: $num / 2 domains discovered"
@@ -496,13 +517,13 @@ function test_list_session ()
 	ok $? "Mi test: list session xsd validation"
 
 	#Expect 2 domain: Jul and UST
-	extract_xml $OUTPUT_DEST $XPATH_LIST_DOMAIN"/type/text()" result
+	extract_xml $OUTPUT_DEST $XPATH_LIST_DOMAIN"/lttng:type/text()" result
 	num=$(echo "$result" | wc -l)
 	test "$num" -eq "2"
 	ok $? "Mi test: $num / 2 domains discovered"
 
 	#Expect 2 channel: test and lttng_jul_event
-	extract_xml $OUTPUT_DEST $XPATH_LIST_CHANNEL"/name/text()" result
+	extract_xml $OUTPUT_DEST $XPATH_LIST_CHANNEL"/lttng:name/text()" result
 	num=$(echo "$result" | wc -l)
 	test "$num" -eq "2"
 	ok $? "Mi test: $num / 2 channel discovered"
@@ -523,7 +544,9 @@ function test_list_ust_event ()
 	OUTPUT_DEST=$OUTPUT_DIR/$OUTPUT_FILE
 
 	#Begin testing
-	$TESTAPP_BIN $NR_ITER $NR_USEC_WAIT ${file_sync_after_first} ${file_sync_before_last} & 2>/dev/null
+	$TESTAPP_BIN -i $NR_ITER -w $NR_USEC_WAIT \
+		--sync-after-first-event ${file_sync_after_first} \
+		--sync-before-last-event ${file_sync_before_last} & 2>/dev/null
 
 	while [ ! -f "${file_sync_after_first}" ]; do
 		sleep 0.5
@@ -537,7 +560,7 @@ function test_list_ust_event ()
 	ok $? "Mi test: list ust event xsd validation"
 
 	#Extract events
-	extract_xml $OUTPUT_DEST "$XPATH_LIST_UST_EVENT""/name/text()" result
+	extract_xml $OUTPUT_DEST "$XPATH_LIST_UST_EVENT""/lttng:name/text()" result
 	num=$(echo "$result" | wc -l)
 
 	#Since the number of events is prone to change we only look for >= from a
@@ -548,7 +571,7 @@ function test_list_ust_event ()
 
 	#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
+	extract_xml $OUTPUT_DEST "$XPATH_LIST_UST_EVENT""[./lttng:name = 'tp:tptest']/lttng:event_fields/lttng:event_field/lttng:name/text()" result
 	num=$(echo "$result" | wc -l)
 	test "$num" -ge "12"
 	ok $? "Mi test: $num / 12 ust event fields discovered"
@@ -598,27 +621,32 @@ function test_start_stop () {
 	ok $? "Mi test: mi report success on start command as expected"
 
 	#Extract session name from xml
-	extract_xml $OUTPUT_DEST $XPATH_SESSION"/name/text()" result
+	extract_xml $OUTPUT_DEST $XPATH_SESSION"/lttng:name/text()" result
 	test "$result" = "$session_name"
 	ok $? "Mi test: started $session_name"
 
 	#Extract enabled expect true
-	extract_xml $OUTPUT_DEST $XPATH_SESSION"/enabled/text()" result
+	extract_xml $OUTPUT_DEST $XPATH_SESSION"/lttng:enabled/text()" result
 	test "$result" = "true"
 	ok $? "Mi test: enabled element : $result expected: true"
 
+	#Test metadata regenerate command
+	regenerate_metadata_ok $session_name
+	$XML_VALIDATE $OUTPUT_DEST
+	ok $? "Mi test: regenerate metadata"
+
 	#Test stop command
 	stop_lttng_tracing_ok $session_name
 	$XML_VALIDATE $OUTPUT_DEST
 	ok $? "Mi test: stop xsd validation"
 
 	#Extract session name from xml
-	extract_xml $OUTPUT_DEST $XPATH_SESSION"/name/text()" result
+	extract_xml $OUTPUT_DEST $XPATH_SESSION"/lttng:name/text()" result
 	test "$result" = "$session_name"
-	ok $? "Mi test: stoped $session_name"
+	ok $? "Mi test: stopped $session_name"
 
 	#Extract enabled expect false
-	extract_xml $OUTPUT_DEST $XPATH_SESSION"/enabled/text()" result
+	extract_xml $OUTPUT_DEST $XPATH_SESSION"/lttng:enabled/text()" result
 	test "$result" = "false"
 	ok $? "Mi test: enabled element : $result expected: false"
 
@@ -660,13 +688,13 @@ function test_snapshot () {
 	ok $? "Mi test: add snapshot is a success"
 
 	#Get data
-	extract_xml $OUTPUT_DEST "$XPATH_SNAPSHOT_ADD_SNAPSHOT""/snapshot/session_name/text()" result
+	extract_xml $OUTPUT_DEST "$XPATH_SNAPSHOT_ADD_SNAPSHOT""/lttng:snapshot/lttng:session_name/text()" result
 	test "$result" = "$session_name"
 	ok $? "Mi test: added snapshot for: $result expected $session_name"
 
 	#Get name of generated output and id
-	extract_xml $OUTPUT_DEST "$XPATH_SNAPSHOT_ADD_SNAPSHOT""/snapshot/name/text()" snapshot_name
-	extract_xml $OUTPUT_DEST "$XPATH_SNAPSHOT_ADD_SNAPSHOT""/snapshot/id/text()" snapshot_id
+	extract_xml $OUTPUT_DEST "$XPATH_SNAPSHOT_ADD_SNAPSHOT""/lttng:snapshot/lttng:name/text()" snapshot_name
+	extract_xml $OUTPUT_DEST "$XPATH_SNAPSHOT_ADD_SNAPSHOT""/lttng:snapshot/lttng:id/text()" snapshot_id
 
 	#Test list output
 	lttng_snapshot_list $session_name
@@ -678,7 +706,7 @@ function test_snapshot () {
 	test "$result" = "true"
 	ok $? "Mi test: add snapshot is a success"
 
-	extract_xml $OUTPUT_DEST "$XPATH_SNAPSHOT_LIST""/session[./name ='$session_name']/snapshots/snapshot/name/text()" result
+	extract_xml $OUTPUT_DEST "$XPATH_SNAPSHOT_LIST""/lttng:session[./lttng:name ='$session_name']/lttng:snapshots/lttng:snapshot/lttng:name/text()" result
 	test "$result" = "$snapshot_name"
 	ok $? "Mi test: snapshot list extracted snapshot: $result expected: $snapshot_name"
 
@@ -693,11 +721,11 @@ function test_snapshot () {
 	ok $? "Mi test: del snapshot is a success"
 
 	#Test data
-	extract_xml $OUTPUT_DEST "$XPATH_SNAPSHOT_DEL""/snapshot/id/text()" result
+	extract_xml $OUTPUT_DEST "$XPATH_SNAPSHOT_DEL""/lttng:snapshot/lttng:id/text()" result
 	test "$result" = "$snapshot_id"
 	ok $? "Mi test: snapshot del extracted snapshot id: $result expected: $snapshot_id"
 
-	extract_xml $OUTPUT_DEST "$XPATH_SNAPSHOT_DEL""/snapshot/session_name/text()" result
+	extract_xml $OUTPUT_DEST "$XPATH_SNAPSHOT_DEL""/lttng:snapshot/lttng:session_name/text()" result
 	test "$result" = "$session_name"
 	ok $? "Mi test: snapshot del extracted snapshot id: $result expected: $session_name"
 
@@ -720,7 +748,6 @@ function test_track_untrack ()
 	diag "Test track/untrack pid"
 
 	local session_name="testTrack"
-	local snapshot_path="$OUTPUT_DIR/trackoutput"
 	local pid="1,2,3"
 	OUTPUT_FILE="track.xml"
 
@@ -739,7 +766,7 @@ function test_track_untrack ()
 	ok $? "Mi test: track pid is a success"
 
 	#Verify that there is 3 process
-	extract_xml $OUTPUT_DEST $XPATH_TRACK_UNTRACK_PID"/pid" result
+	extract_xml $OUTPUT_DEST $XPATH_TRACK_UNTRACK_PID"/lttng:pid" result
 	num=$(echo "$result" | wc -l)
 	test "$num" -eq "3"
 	ok $? "Mi test: track pid expecting 3 processes got $num"
@@ -750,7 +777,7 @@ function test_track_untrack ()
 	ok $? "Mi test: session list with pid_tracker validate"
 
 	#Check the good count
-	extract_xml $OUTPUT_DEST $XPATH_PID_TRACKER"/targets/pid_target/pid" result
+	extract_xml $OUTPUT_DEST $XPATH_PID_TRACKER"/lttng:targets/lttng:pid_target/lttng:pid" result
 	num=$(echo "$result" | wc -l)
 	test "$num" -eq "3"
 	ok $? "Mi test: tracker pid listing expecting 3 target got $num"
@@ -766,7 +793,7 @@ function test_track_untrack ()
 	ok $? "Mi test: untrack pid is a success"
 
 	#Verify that there is 2 untracked pids
-	extract_xml $OUTPUT_DEST $XPATH_TRACK_UNTRACK_PID"/pid" result
+	extract_xml $OUTPUT_DEST $XPATH_TRACK_UNTRACK_PID"/lttng:pid" result
 	num=$(echo "$result" | wc -l)
 	test "$num" -eq "2"
 	ok $? "Mi test: untrack pid expecting 2 process got $num"
@@ -777,7 +804,7 @@ function test_track_untrack ()
 	ok $? "Mi test: session list with pid_tracker validate"
 
 	#Check the good count
-	extract_xml $OUTPUT_DEST $XPATH_PID_TRACKER"/targets/pid_target/pid" result
+	extract_xml $OUTPUT_DEST $XPATH_PID_TRACKER"/lttng:targets/lttng:pid_target/lttng:pid" result
 	num=$(echo "$result" | wc -l)
 	test "$num" -eq "1"
 	ok $? "Mi test: tracker pid listing expecting 1 process got $num"
@@ -793,7 +820,7 @@ function test_track_untrack ()
 	ok $? "Mi test: untrack all pid is a success"
 
 	#Verify that there is 1 untracked pid
-	extract_xml $OUTPUT_DEST $XPATH_TRACK_UNTRACK_PID"/pid" result
+	extract_xml $OUTPUT_DEST $XPATH_TRACK_UNTRACK_PID"/lttng:pid" result
 	num=$(echo "$result" | wc -l)
 	test "$num" -eq "1"
 	ok $? "Mi test: untrack pid expecting 1 process got $num"
@@ -810,7 +837,7 @@ function test_track_untrack ()
 	ok $? "Mi test: session list with pid_tracker validate"
 
 	#Check the good count
-	extract_xml $OUTPUT_DEST $XPATH_PID_TRACKER"/targets/pid_target/pid" result
+	extract_xml $OUTPUT_DEST $XPATH_PID_TRACKER"/lttng:targets/lttng:pid_target/lttng:pid" result
 	num=$(echo -n "$result" | wc -l)
 	test "$num" -eq "0"
 	ok $? "Mi test: tracker pid listing expecting 0 process got $num"
@@ -826,7 +853,7 @@ function test_track_untrack ()
 	ok $? "Mi test: track all pid is a success"
 
 	#Verify that there is 1 tracked process
-	extract_xml $OUTPUT_DEST $XPATH_TRACK_UNTRACK_PID"/pid" result
+	extract_xml $OUTPUT_DEST $XPATH_TRACK_UNTRACK_PID"/lttng:pid" result
 	num=$(echo "$result" | wc -l)
 	test "$num" -eq "1"
 	ok $? "Mi test: track pid expecting 1 process got $num"
@@ -850,7 +877,19 @@ function test_track_untrack ()
 	destroy_lttng_sessions
 }
 
-start_lttng_sessiond $FOO_LOAD_DIR
+function test_add_context_list()
+{
+	diag "Test context listing"
+
+	OUTPUT_FILE="list-context.xml"
+	OUTPUT_DEST=$OUTPUT_DIR/$OUTPUT_FILE
+	lttng_add_context_list
+
+	$XML_VALIDATE $OUTPUT_DEST
+	ok $? "Mi test: context listing validation"
+}
+
+start_lttng_sessiond $SESSIOND_LOAD_DIR
 TESTS=(
 	test_version
 	test_create_session
@@ -865,6 +904,8 @@ TESTS=(
 	test_start_stop
 	test_snapshot
 	test_track_untrack
+	test_list_session_long_path
+	test_add_context_list
 )
 
 
@@ -877,6 +918,7 @@ do
 	fi
 done
 rm -rf $OUTPUT_DIR
+rm -rf $FOO_LOAD_DIR
 
 OUTPUT_DEST=/dev/null 2>&1
 stop_lttng_sessiond