X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fdestructive%2Fmetadata-regeneration;h=729634f87d2b974f25760eb84d79cebe966beb7e;hp=32469b5b4390e0d57cd530ab0cacbfb17a6238bb;hb=701a99d1cf638273320db3ce52cf52816129d95a;hpb=512eb1488340c4c3c0c29e6cde9d489e858fdd6c

diff --git a/tests/destructive/metadata-regeneration b/tests/destructive/metadata-regeneration
index 32469b5b4..729634f87 100755
--- a/tests/destructive/metadata-regeneration
+++ b/tests/destructive/metadata-regeneration
@@ -48,13 +48,6 @@ plan_tests $NUM_TESTS
 
 print_test_banner "$TEST_DESC"
 
-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 validate_trace_date
 {
 	local test_date=$1
@@ -89,7 +82,7 @@ function test_kernel_local ()
 	validate_trace_date $DATE1 $TRACE_PATH
 	start_lttng_tracing_ok $SESSION_NAME
 	date "+%Y-%m-%d %H:%M" -s "$DATE2 $HOUR" >/dev/null
-	metadata_regenerate_ok $SESSION_NAME
+	regenerate_metadata_ok $SESSION_NAME
 	stop_lttng_tracing_ok $SESSION_NAME
 	validate_trace_date $DATE2 $TRACE_PATH
 	if [ $? -eq 0 ]; then
@@ -103,7 +96,7 @@ function test_kernel_streaming ()
 {
 	diag "Test kernel streaming with metadata regeneration"
 	date "+%Y-%m-%d %H:%M" -s "$DATE1 $HOUR" >/dev/null
-	lttng_create_session_uri
+	create_lttng_session_uri $SESSION_NAME net://localhost
 	lttng_enable_kernel_event $SESSION_NAME $KERNEL_EVENT_NAME
 	start_lttng_tracing_ok $SESSION_NAME
 	echo -n "100" > /proc/lttng-test-filter-event
@@ -111,7 +104,7 @@ function test_kernel_streaming ()
 	validate_trace_date $DATE1 $TRACE_PATH/$HOSTNAME/$SESSION_NAME*
 	start_lttng_tracing_ok $SESSION_NAME
 	date "+%Y-%m-%d %H:%M" -s "$DATE2 $HOUR" >/dev/null
-	metadata_regenerate_ok $SESSION_NAME
+	regenerate_metadata_ok $SESSION_NAME
 	stop_lttng_tracing_ok $SESSION_NAME
 	# Validate test
 	validate_trace_date $DATE2 $TRACE_PATH/$HOSTNAME/$SESSION_NAME*
@@ -147,7 +140,7 @@ function test_ust_local ()
 
 	start_lttng_tracing_ok $SESSION_NAME
 	date "+%Y-%m-%d %H:%M" -s "$DATE2 $HOUR" >/dev/null
-	metadata_regenerate_ok $SESSION_NAME
+	regenerate_metadata_ok $SESSION_NAME
 
 	stop_lttng_tracing_ok $SESSION_NAME
 	destroy_lttng_session_ok $SESSION_NAME
@@ -167,7 +160,7 @@ function test_ust_streaming ()
 
 	diag "Test UST streaming with metadata regeneration"
 	date "+%Y-%m-%d %H:%M" -s "$DATE1 $HOUR" >/dev/null
-	lttng_create_session_uri
+	create_lttng_session_uri $SESSION_NAME net://localhost
 	enable_ust_lttng_event_ok $SESSION_NAME $UST_EVENT_NAME
 
 	$TESTAPP_BIN $NR_ITER $NR_USEC_WAIT ${file_sync_after_first} ${file_sync_before_last} /dev/null 2>&1 &
@@ -184,7 +177,7 @@ function test_ust_streaming ()
 	start_lttng_tracing_ok $SESSION_NAME
 	date "+%Y-%m-%d %H:%M" -s "$DATE2 $HOUR" >/dev/null
 
-	metadata_regenerate_ok $SESSION_NAME
+	regenerate_metadata_ok $SESSION_NAME
 
 	stop_lttng_tracing_ok $SESSION_NAME
 	destroy_lttng_session_ok $SESSION_NAME