Tests: consolidate session creation with a uri parameter in utils.sh

[lttng-tools.git] / tests / regression / tools / rotation / test_ust

diff --git a/tests/regression/tools/rotation/test_ust b/tests/regression/tools/rotation/test_ust
index fcad28e698562572ff521a6d4ed70baad70eb05c..9c4f923b802fed399f135eab5d1d9e90c694a674 100755 (executable)
--- a/tests/regression/tools/rotation/test_ust
+++ b/tests/regression/tools/rotation/test_ust
@@ -38,7 +38,7 @@ if [ ! -x "$TESTAPP_BIN" ]; then
        BAIL_OUT "No UST events binary detected."
 fi
 
-function enable_channel_per_pid()
+function enable_channel_per_pid ()
 {
        sess_name=$1
        channel_name=$2
@@ -46,14 +46,6 @@ function enable_channel_per_pid()
        enable_ust_lttng_channel_ok $sess_name $channel_name --buffers-pid
 }
 
-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 $SESSION_NAME"
-}
-
 # MUST set TESTDIR before calling those functions
 
 function rotate_ust_test ()
@@ -90,7 +82,7 @@ function rotate_ust_test ()
 function test_ust_streaming_uid ()
 {
        diag "Test UST streaming with session rotation per UID"
-       lttng_create_session_uri
+       create_lttng_session_uri $SESSION_NAME net://localhost
        enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME
 
        rotate_ust_test "${TRACE_PATH}/${HOSTNAME}/${SESSION_NAME}*" "ust/uid/*/*/" 0
@@ -110,7 +102,7 @@ function test_ust_local_uid ()
 function test_ust_streaming_pid ()
 {
        diag "Test UST streaming with session rotation per PID"
-       lttng_create_session_uri
+       create_lttng_session_uri $SESSION_NAME net://localhost
        enable_channel_per_pid $SESSION_NAME "channel0"
        enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME "channel0"
 
@@ -146,7 +138,7 @@ function test_ust_local_timer_uid ()
 function test_ust_streaming_timer_uid ()
 {
        diag "Test ust remote with session rotation timer per-uid"
-       lttng_create_session_uri
+       create_lttng_session_uri $SESSION_NAME net://localhost
        enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME
        lttng_enable_rotation_timer_ok $SESSION_NAME 500ms
        start_lttng_tracing_ok $SESSION_NAME
@@ -175,7 +167,7 @@ function test_ust_local_timer_pid ()
 function test_ust_streaming_timer_pid ()
 {
        diag "Test ust remote with session rotation timer per-pid"
-       lttng_create_session_uri
+       create_lttng_session_uri $SESSION_NAME net://localhost
        enable_channel_per_pid $SESSION_NAME "channel0"
        enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME "channel0"
        lttng_enable_rotation_timer_ok $SESSION_NAME 500ms