tests: truncate metadata file for regenerate metadata test

[lttng-tools.git] / tests / regression / tools / regen-metadata / test_ust

diff --git a/tests/regression/tools/regen-metadata/test_ust b/tests/regression/tools/regen-metadata/test_ust
index b7f1af1d8fd265f9666a7becf28e10c4c4f1367a..e4a8c19843a52c4ab3dd72c68d96104de4fd6beb 100755 (executable)
--- a/tests/regression/tools/regen-metadata/test_ust
+++ b/tests/regression/tools/regen-metadata/test_ust
@@ -25,11 +25,10 @@ TESTAPP_NAME="gen-ust-events"
 TESTAPP_BIN="$TESTAPP_PATH/$TESTAPP_NAME/$TESTAPP_NAME"
 SESSION_NAME="stream"
 EVENT_NAME="tp:tptest"
-PID_RELAYD=0
 
 TRACE_PATH=$(mktemp -d)
 
-NUM_TESTS=33
+NUM_TESTS=39
 
 source $TESTDIR/utils/utils.sh
 
@@ -37,20 +36,6 @@ if [ ! -x "$TESTAPP_BIN" ]; then
        BAIL_OUT "No UST events binary detected."
 fi
 
-function lttng_create_session_uri
-{
-       # Create session with default path
-       $TESTDIR/../src/bin/lttng/$LTTNG_BIN create $SESSION_NAME -U net://localhost >/dev/null 2>&1
-       ok $? "Create session with default path"
-}
-
-function lttng_create_session_uri_live
-{
-       # Create session with default path
-       $TESTDIR/../src/bin/lttng/$LTTNG_BIN create $SESSION_NAME --live -U net://localhost >/dev/null 2>&1
-       ok $? "Create live session"
-}
-
 function enable_channel_per_pid()
 {
        sess_name=$1
@@ -66,9 +51,10 @@ function test_ust_streaming ()
 {
        local file_sync_after_first=$(mktemp -u)
        local file_sync_before_last=$(mktemp -u)
+       local metadata_path
 
        diag "Test UST streaming with metadata regeneration"
-       lttng_create_session_uri
+       create_lttng_session_uri $SESSION_NAME net://localhost
        enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME
 
        $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT ${file_sync_after_first} ${file_sync_before_last} /dev/null 2>&1 &
@@ -79,16 +65,26 @@ function test_ust_streaming ()
 
        # Wait for the applications started in background
        wait
-       regenerate_metadata_ok $SESSION_NAME
 
+       # Expect a valid trace
        stop_lttng_tracing_ok $SESSION_NAME
-       destroy_lttng_session_ok $SESSION_NAME
-       # Validate test
+       validate_trace $EVENT_NAME "$TRACE_PATH/$HOSTNAME/$SESSION_NAME"*
+
+       # Find the metadata file
+       metadata_path=$(find "$TRACE_PATH/$HOSTNAME/$SESSION_NAME"* | grep metadata)
+
+       # Empty the metadata file
+       echo -n > "$metadata_path"
+
+       start_lttng_tracing_ok $SESSION_NAME
+       regenerate_metadata_ok $SESSION_NAME
+       stop_lttng_tracing_ok $SESSION_NAME
+
+       # Metadata file must have been regenerated
        validate_trace $EVENT_NAME $TRACE_PATH/$HOSTNAME/$SESSION_NAME*
-       if [ $? -eq 0 ]; then
-               # Only delete if successful
-               rm -rf $TRACE_PATH
-       fi
+       destroy_lttng_session_ok $SESSION_NAME
+
+       rm -rf "$TRACE_PATH"
        rm -f ${file_sync_after_first}
        rm -f ${file_sync_before_last}
 }
@@ -97,6 +93,7 @@ function test_ust_local ()
 {
        local file_sync_after_first=$(mktemp -u)
        local file_sync_before_last=$(mktemp -u)
+       local metadata_path
 
        diag "Test UST local with metadata regeneration"
        create_lttng_session_ok $SESSION_NAME $TRACE_PATH
@@ -110,16 +107,26 @@ function test_ust_local ()
 
        # Wait for the applications started in background
        wait
-       regenerate_metadata_ok $SESSION_NAME
 
+       # Expect a valid trace
        stop_lttng_tracing_ok $SESSION_NAME
-       destroy_lttng_session_ok $SESSION_NAME
-       # Validate test
+       validate_trace $EVENT_NAME "$TRACE_PATH"
+
+       # Find the metadata file
+       metadata_path=$(find "$TRACE_PATH"* | grep metadata)
+
+       # Empty the metadata file
+       echo -n > "$metadata_path"
+
+       start_lttng_tracing_ok $SESSION_NAME
+       regenerate_metadata_ok $SESSION_NAME
+       stop_lttng_tracing_ok $SESSION_NAME
+
+       # Metadata file must have been regenerated
        validate_trace $EVENT_NAME $TRACE_PATH
-       if [ $? -eq 0 ]; then
-               # Only delete if successful
-               rm -rf $TRACE_PATH
-       fi
+       destroy_lttng_session_ok $SESSION_NAME
+
+       rm -rf "$TRACE_PATH"
        rm -f ${file_sync_after_first}
        rm -f ${file_sync_before_last}
 }
@@ -162,7 +169,7 @@ function test_ust_live ()
        local file_sync_before_last=$(mktemp -u)
 
        diag "Test UST live with metadata regeneration (expect failure)"
-       lttng_create_session_uri_live $SESSION_NAME $TRACE_PATH
+       create_lttng_session_uri $SESSION_NAME net://localhost --live
        enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME
 
        $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT ${file_sync_after_first} ${file_sync_before_last} /dev/null 2>&1 &