X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fmi%2Ftest_mi;h=faeb3d09bc5f7bac534cfa742e26ad7771233fb5;hb=HEAD;hp=e17cad1309da474526ea1b5cbd04e824d5807f19;hpb=522c987c3a14f1ba921a65788b408656e7417486;p=lttng-tools.git

diff --git a/tests/regression/tools/mi/test_mi b/tests/regression/tools/mi/test_mi
index e17cad130..faeb3d09b 100755
--- a/tests/regression/tools/mi/test_mi
+++ b/tests/regression/tools/mi/test_mi
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (C) 2014 Jonathan Rajotte <jonathan.r.julien@gmail.com>
+# Copyright (C) 2014 EfficiOS Inc.
 #
 # SPDX-License-Identifier: LGPL-2.1-only
 
@@ -17,8 +17,8 @@ NR_USEC_WAIT=0
 NR_ITER=10000
 
 #Temp file output
-OUTPUT_DIR=$(mktemp --tmpdir -d tmp.test_mi_output_dir.XXXXXX)
-SESSIOND_LOAD_DIR=$(mktemp --tmpdir -d tmp.test_mi_sessiond_load_dir.XXXXXX)
+OUTPUT_DIR=$(mktemp -d -t tmp.test_mi_output_dir.XXXXXX)
+SESSIOND_LOAD_DIR=$(mktemp -d -t tmp.test_mi_sessiond_load_dir.XXXXXX)
 OUTPUT_FILE="default.xml"
 
 XPATH_CMD_OUTPUT="//lttng:command/lttng:output"
@@ -217,7 +217,7 @@ function test_list_sessions ()
 	done
 
 	OUTPUT_DEST=$OUTPUT_DIR/$OUTPUT_FILE
-	list_lttng_with_opts
+	list_lttng_ok
 	$MI_VALIDATE $OUTPUT_DEST
 	ok $? "Mi test: list sessions xsd validation"
 
@@ -248,7 +248,7 @@ function test_list_session_long_path ()
 	create_lttng_session_ok $session_name ${output_basedir}
 
 	OUTPUT_DEST=${output_basedir}/$OUTPUT_FILE
-	list_lttng_with_opts
+	list_lttng_ok
 	$MI_VALIDATE $OUTPUT_DEST
 	ok $? "Mi test: list session with long path xsd validation"
 
@@ -410,7 +410,7 @@ function test_list_channel ()
 
 	#Begin testing
 	OUTPUT_DEST=$OUTPUT_DIR/$OUTPUT_FILE
-	list_lttng_with_opts "$session_name -c $channel_name"
+	list_lttng_ok "$session_name -c $channel_name"
 	$MI_VALIDATE $OUTPUT_DEST
 	ok $? "Mi test: list channel xsd validation"
 
@@ -460,7 +460,7 @@ function test_list_domain ()
 
 	#Begin testing
 	OUTPUT_DEST=$OUTPUT_DIR/$OUTPUT_FILE
-	list_lttng_with_opts "$session_name -d"
+	list_lttng_ok "$session_name -d"
 	$MI_VALIDATE $OUTPUT_DEST
 	ok $? "Mi test: list domain xsd validation"
 
@@ -511,7 +511,7 @@ function test_list_session ()
 
 	#Begin testing
 	OUTPUT_DEST=$OUTPUT_DIR/$OUTPUT_FILE
-	list_lttng_with_opts $session_name
+	list_lttng_ok $session_name
 	$MI_VALIDATE $OUTPUT_DEST
 	ok $? "Mi test: list session xsd validation"
 
@@ -536,8 +536,8 @@ function test_list_ust_event ()
 {
 	diag "Test list ust event"
 
-	local file_sync_after_first=$(mktemp --tmpdir -u "tmp.${FUNCNAME[0]}_sync_after_first.XXXXXX")
-	local file_sync_before_last=$(mktemp --tmpdir -u "tmp.${FUNCNAME[0]}_sync_before_last.XXXXXX")
+	local file_sync_after_first=$(mktemp -u -t "tmp.${FUNCNAME[0]}_sync_after_first.XXXXXX")
+	local file_sync_before_last=$(mktemp -u -t "tmp.${FUNCNAME[0]}_sync_before_last.XXXXXX")
 
 	OUTPUT_FILE="list_ust_event.xml"
 
@@ -553,7 +553,7 @@ function test_list_ust_event ()
 		sleep 0.5
 	done
 
-	list_lttng_with_opts "-u -f"
+	list_lttng_ok "-u -f"
 
 	touch ${file_sync_before_last}
 
@@ -656,14 +656,14 @@ function test_start_stop ()
 	ok $? "Mi test: enabled element : $result expected: false"
 
 	#Test failing stop command
-	stop_lttng_tracing_fail $session_name
+	stop_lttng_tracing_ok $session_name
 	$MI_VALIDATE $OUTPUT_DEST
-	ok $? "Mi test: failed stop xsd validation"
+	ok $? "Mi test: stop warning xsd validation"
 
-	#Expect a false element
+	#Expect a true element
 	extract_xml $OUTPUT_DEST $XPATH_COMMAND_SUCCESS result
-	test "$result" = "false"
-	ok $? "Mi test: mi report failure on start command as expected"
+	test "$result" = "true"
+	ok $? "Mi test: mi reports success on stop command as expected"
 
 	#Teardown
 	OUTPUT_DEST=$DEVNULL
@@ -779,7 +779,7 @@ function test_track_untrack ()
 	ok $? "Mi test: track pid expecting 3 processes got $num"
 
 	#Test the pid_tracker listing
-	list_lttng_with_opts $session_name
+	list_lttng_ok $session_name
 	$MI_VALIDATE $OUTPUT_DEST
 	ok $? "Mi test: session list with pid_tracker validate"
 
@@ -806,7 +806,7 @@ function test_track_untrack ()
 	ok $? "Mi test: untrack pid expecting 2 process got $num"
 
 	#Check pid_tracker listing
-	list_lttng_with_opts $session_name
+	list_lttng_ok $session_name
 	$MI_VALIDATE $OUTPUT_DEST
 	ok $? "Mi test: session list with pid_tracker validate"
 
@@ -839,7 +839,7 @@ function test_track_untrack ()
 	#Test if pid_tracker is enabled as definied by pid_tracker
 	#behavior. If all pid are untrack than the pid_tracker is still
 	#enabled (pid_tracker node is present).
-	list_lttng_with_opts $session_name
+	list_lttng_ok $session_name
 	$MI_VALIDATE $OUTPUT_DEST
 	ok $? "Mi test: session list with pid_tracker validate"
 
@@ -872,7 +872,7 @@ function test_track_untrack ()
 	#Test if pid_tracker is enabled as definied by pid_tracker
 	#behavior. If all pid are untrack thant the pid_tracker is
 	#disabled (node pid_tracker do not exist)
-	list_lttng_with_opts $session_name
+	list_lttng_ok $session_name
 	$MI_VALIDATE $OUTPUT_DEST
 	ok $? "Mi test: session list with pid_tracker validate"