Bump LTTng MI schema to 3.0

[lttng-tools.git] / tests / regression / tools / mi / test_mi

diff --git a/tests/regression/tools/mi/test_mi b/tests/regression/tools/mi/test_mi
index 5e8a31d91ee879cc9ac1db13ac4b98deffc81d4e..cb0470bb76afcf91fa1097df13c19d4709625a70 100755 (executable)
--- a/tests/regression/tools/mi/test_mi
+++ b/tests/regression/tools/mi/test_mi
@@ -19,7 +19,7 @@ TEST_DESC="Machine interface testing"
 
 CURDIR=$(dirname $0)/
 TESTDIR=$CURDIR/../../../
-XSD_PATH=$TESTDIR/../src/common/mi_lttng.xsd
+XSD_PATH=$TESTDIR/../src/common/mi-lttng-3.0.xsd
 SESSIOND_BIN="lttng-sessiond"
 RELAYD_BIN="lttng-relayd"
 
@@ -48,7 +48,7 @@ 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']/processes/process/events/event"
+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"
@@ -59,7 +59,7 @@ DEVNULL=/dev/null 2>&1
 
 DIR=$(readlink -f $TESTDIR)
 
-NUM_TESTS=234
+NUM_TESTS=222
 
 source $TESTDIR/utils/utils.sh
 
@@ -744,21 +744,6 @@ function test_track_untrack ()
        test "$num" -eq "3"
        ok $? "Mi test: track pid expecting 3 processes got $num"
 
-       #Retry to enable and look for fail
-       lttng_track_fail "-p $pid -u"
-       $XML_VALIDATE $OUTPUT_DEST
-       ok $? "Mi test: fail track pid xsd validation"
-
-       #Expect a false element
-       extract_xml $OUTPUT_DEST $XPATH_COMMAND_SUCCESS result
-       test "$result" = "false"
-       ok $? "Mi test: track pid expected false got $result"
-
-       extract_xml $OUTPUT_DEST $XPATH_TRACK_UNTRACK_PID"[./success='false']/pid" result
-       num=$(echo "$result" | wc -l)
-       test "$num" -eq "3"
-       ok $? "Mi test: track pid expecting 3 failed process got $num"
-
        #Test the pid_tracker listing
        list_lttng_with_opts $session_name
        $XML_VALIDATE $OUTPUT_DEST
@@ -786,22 +771,6 @@ function test_track_untrack ()
        test "$num" -eq "2"
        ok $? "Mi test: untrack pid expecting 2 process got $num"
 
-       #Retry to untrack and look for fail
-       lttng_untrack_fail "-p 2,3 -u"
-       $XML_VALIDATE $OUTPUT_DEST
-       ok $? "Mi test: fail untrack pid xsd validation"
-
-       #Expect a false element
-       extract_xml $OUTPUT_DEST $XPATH_COMMAND_SUCCESS result
-       test "$result" = "false"
-       ok $? "Mi test: untrack pid expected false got $result"
-
-       #Expect 2 failed attempt at untracking
-       extract_xml $OUTPUT_DEST $XPATH_TRACK_UNTRACK_PID"[./success='false']/pid" result
-       num=$(echo "$result" | wc -l)
-       test "$num" -eq "2"
-       ok $? "Mi test: untrack pid expecting 2 failed process got $num"
-
        #Check pid_tracker listing
        list_lttng_with_opts $session_name
        $XML_VALIDATE $OUTPUT_DEST