Backport: trackers: tests: adapt tests to new xsd schemas

[deliverable/lttng-tools.git] / tests / regression / tools / save-load / test_load

diff --git a/tests/regression/tools/save-load/test_load b/tests/regression/tools/save-load/test_load
index 005ec4c9c84d6f335589608884d42a21d72babb0..8b4bc2ac859443e7366251cb23e62bc7940a59c5 100755 (executable)
--- a/tests/regression/tools/save-load/test_load
+++ b/tests/regression/tools/save-load/test_load
@@ -30,7 +30,7 @@ EVENT_NAME="tp:tptest"
 
 DIR=$(readlink -f $TESTDIR)
 
-NUM_TESTS=66
+NUM_TESTS=72
 
 source $TESTDIR/utils/utils.sh
 
@@ -142,15 +142,33 @@ function test_trackers()
                break;
        fi
        $TESTDIR/../src/bin/lttng/$LTTNG_BIN --mi XML list "$SESSION_NAME-trackers" > $mi_output_file
-       mi_result=$($CURDIR/../mi/extract_xml -e $mi_output_file "//lttng:command/lttng:output/lttng:sessions/lttng:session/lttng:domains/lttng:domain/lttng:trackers/lttng:pid_tracker/lttng:targets/lttng:pid_target")
+       mi_result=$($CURDIR/../mi/extract_xml -e $mi_output_file "//lttng:command/lttng:output/lttng:sessions/lttng:session/lttng:domains/lttng:domain/lttng:trackers/lttng:vpid_tracker/lttng:targets/lttng:vpid_target")
        if [[ $mi_result = "true" ]]; then
-           ok 0 "Pid target is present"
+           ok 0 "VPID target is present"
        else
-           fail "Pid target missing"
+           fail "VPID target missing"
+       fi
+
+       mi_result=$($CURDIR/../mi/extract_xml -e $mi_output_file "//lttng:command/lttng:output/lttng:sessions/lttng:session/lttng:domains/lttng:domain/lttng:trackers/lttng:vuid_tracker/lttng:targets/lttng:vuid_target")
+       if [[ $mi_result = "true" ]]; then
+           ok 0 "VUID target is present"
+       else
+           fail "VUID target missing"
+       fi
+
+       mi_result=$($CURDIR/../mi/extract_xml -e $mi_output_file "//lttng:command/lttng:output/lttng:sessions/lttng:session/lttng:domains/lttng:domain/lttng:trackers/lttng:vgid_tracker/lttng:targets/lttng:vgid_target")
+       if [[ $mi_result = "true" ]]; then
+           ok 0 "VGID target is present"
+       else
+           fail "VGID target missing"
        fi
 
        # Test to remove the target just to make sure
-       lttng_untrack_ok "-p 666 -u -s $SESSION_NAME-trackers"
+       lttng_untrack_ok "--vpid 666 -u -s $SESSION_NAME-trackers"
+       lttng_untrack_ok "--vuid 777 -u -s $SESSION_NAME-trackers"
+       lttng_untrack_ok "--vgid 888 -u -s $SESSION_NAME-trackers"
+       # Actually using vpid (backward compat)
+       lttng_untrack_ok "--pid 999 -u -s $SESSION_NAME-trackers"
 
        destroy_lttng_session_ok "$SESSION_NAME-trackers"
        rm -rf ${mi_output_file}
@@ -306,6 +324,7 @@ function test_override_session_name()
 {
        diag "Test session name override"
        local override_name="PinkyAndTheBrain"
+       local output_path="/tmp/lttng/load-42-1"
 
        local mi_output_file=$(mktemp)
        if [ $? -ne 0 ]; then
@@ -323,6 +342,12 @@ function test_override_session_name()
 
        test "${mi_result}" = "${override_name}"
        ok $? "Override name successful  [${SESSION_NAME} to ${override_name}]"
+
+       # Make sure that the name override did not change something else
+       mi_result=$($CURDIR/../mi/extract_xml $mi_output_file "//lttng:command/lttng:output/lttng:sessions/lttng:session/lttng:path")
+       test "${mi_result}" = "${output_path}"
+       ok $? "Output path is not affected by name override"
+
        destroy_lttng_session_ok "${override_name}"
 
        diag "Test session name override with all (Do not permit)"
@@ -339,10 +364,10 @@ TESTS=(
        test_all_load
        test_overwrite
        test_trackers
+       test_override_session_name
        test_override_url_normal
        test_override_url_snapshot
        test_override_url_live
-       test_override_session_name
 )
 
 for fct_test in ${TESTS[@]};