Refactor: test: wrapper for destroy_lttng_session

[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 d660878a76f2c8cbc6fb6fb2491a70b81765268c..c6234efe1fce443e6f7573079db2f7e05b954983 100755 (executable)
--- a/tests/regression/tools/save-load/test_load
+++ b/tests/regression/tools/save-load/test_load
@@ -22,13 +22,14 @@ TESTDIR=$CURDIR/../../../
 SESSIOND_BIN="lttng-sessiond"
 RELAYD_BIN="lttng-relayd"
 LTTNG_BIN="lttng"
+export LTTNG_SESSION_CONFIG_XSD_PATH=$(readlink -m ${TESTDIR}../src/common/config/)
 
 SESSION_NAME="load-42"
 EVENT_NAME="tp:tptest"
 
 DIR=$(readlink -f $TESTDIR)
 
-NUM_TESTS=20
+NUM_TESTS=21
 
 source $TESTDIR/utils/utils.sh
 
@@ -53,7 +54,7 @@ function test_basic_load()
 
        lttng_load "-i $CURDIR/$SESSION_NAME.lttng"
 
-       destroy_lttng_session $SESSION_NAME
+       destroy_lttng_session_ok $SESSION_NAME
 }
 
 function test_complex_load()
@@ -77,7 +78,19 @@ function test_complex_load()
        disable_ust_lttng_channel $sess chan2
        disable_ust_lttng_channel $sess chan3
 
-       destroy_lttng_session $sess
+       # Confirm that an event stored as disabled is restored in its disabled state
+       local mi_output_file=$(mktemp)
+       if [ $? -ne 0 ]; then
+               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()")
+       if [[ $mi_result = "false" ]]; then
+           ok 0 "Disabled event is loaded in disabled state"
+       else
+           fail "Disabled event is loaded in disabled state"
+       fi
+       destroy_lttng_session_ok $sess
 
        stop_lttng_relayd_nocheck
 }
@@ -92,8 +105,8 @@ function test_all_load()
 
        lttng_load "-a -i $CURDIR"
 
-       destroy_lttng_session $SESSION_NAME
-       destroy_lttng_session "$SESSION_NAME-complex"
+       destroy_lttng_session_ok $SESSION_NAME
+       destroy_lttng_session_ok "$SESSION_NAME-complex"
 
        stop_lttng_relayd_nocheck
 }
@@ -107,7 +120,7 @@ function test_overwrite()
        # This one should succeed
        lttng_load "-f -i $CURDIR $SESSION_NAME"
 
-       destroy_lttng_session $SESSION_NAME
+       destroy_lttng_session_ok $SESSION_NAME
 }
 
 start_lttng_sessiond