Tests: Consider lttng mi namespace in test_load

[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 35955b5387e486d26a33e48ef4b6030c5ee7771a..11563985c838fdc08c5552e8cb9b4f7541eccb75 100755 (executable)
--- a/tests/regression/tools/save-load/test_load
+++ b/tests/regression/tools/save-load/test_load
@@ -29,7 +29,7 @@ EVENT_NAME="tp:tptest"
 
 DIR=$(readlink -f $TESTDIR)
 
-NUM_TESTS=26
+NUM_TESTS=28
 
 source $TESTDIR/utils/utils.sh
 
@@ -74,7 +74,7 @@ function test_complex_load()
                break;
        fi
        $TESTDIR/../src/bin/lttng/$LTTNG_BIN --mi XML list $sess -c chan2 > $mi_output_file
-       mi_result=$($CURDIR/../mi/extract_xml $mi_output_file "//command/output/sessions/session/domains/domain/channels/channel[name='chan2']/events/event[name='uevent_disabled']/enabled/text()")
+       mi_result=$($CURDIR/../mi/extract_xml $mi_output_file "//lttng:command/lttng:output/lttng:sessions/lttng:session/lttng:domains/lttng:domain/lttng:channels/lttng:channel[lttng:name='chan2']/lttng:events/lttng:event[lttng:name='uevent_disabled']/lttng:enabled/text()")
        if [[ $mi_result = "false" ]]; then
            ok 0 "Disabled event is loaded in disabled state"
        else
@@ -82,7 +82,7 @@ function test_complex_load()
        fi
        destroy_lttng_session_ok $sess
 
-       stop_lttng_relayd_nocheck
+       stop_lttng_relayd
 }
 
 function test_all_load()
@@ -99,7 +99,7 @@ function test_all_load()
        destroy_lttng_session_ok "$SESSION_NAME-complex"
        destroy_lttng_session_ok "$SESSION_NAME-trackers"
 
-       stop_lttng_relayd_nocheck
+       stop_lttng_relayd
 }
 
 function test_overwrite()
@@ -126,7 +126,7 @@ 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 "//command/output/sessions/session/domains/domain/trackers/pid_tracker/targets/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:pid_tracker/lttng:targets/lttng:pid_target")
        if [[ $mi_result = "true" ]]; then
            ok 0 "Pid target is present"
        else