X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Fplugins%2Fsrc.ctf.lttng-live%2Ftest_live;fp=tests%2Fplugins%2Fsrc.ctf.lttng-live%2Ftest_live;h=9b44ec211b71a09e55eeefa33e54b7454c8f37ee;hb=2b763e2981a27a45f9a24e0dc74c96dbf40ffaf0;hp=58a58514414daa6f6a0dfc81ffc5ed87ec54d8d4;hpb=4079467b0a1f4bf9a6eeba10cd4408ec9f1c72e6;p=babeltrace.git

diff --git a/tests/plugins/src.ctf.lttng-live/test_live b/tests/plugins/src.ctf.lttng-live/test_live
index 58a58514..9b44ec21 100755
--- a/tests/plugins/src.ctf.lttng-live/test_live
+++ b/tests/plugins/src.ctf.lttng-live/test_live
@@ -8,7 +8,7 @@
 # This test validates that a `src.ctf.fs` component successfully reads
 # specific CTF traces and creates the expected messages.
 #
-# Such CTF traces to open either exist (in `tests/ctf-traces/succeed`)
+# Such CTF traces to open either exist (in `tests/ctf-traces/`)
 # or are generated by this test using local trace generators.
 
 SH_TAP=1
@@ -36,7 +36,7 @@ trap cleanup SIGINT SIGTERM
 
 this_dir_relative="plugins/src.ctf.lttng-live"
 test_data_dir="$BT_TESTS_DATADIR/$this_dir_relative"
-trace_dir="$BT_CTF_TRACES_PATH/succeed"
+trace_dir="$BT_CTF_TRACES_PATH"
 
 if [ "$BT_OS_TYPE" = "mingw" ]; then
 	# Same as the above, but in Windows form (C:\foo\bar) instead of Unix form
@@ -54,7 +54,9 @@ lttng_live_server() {
 	local server_script="$test_data_dir/lttng_live_server.py"
 
 	# start server
-	echo "$server_args" | xargs "$BT_TESTS_PYTHON_BIN" "$server_script" --port-file "$port_file" &
+	echo "$server_args" | xargs "$BT_TESTS_PYTHON_BIN" "$server_script" \
+		--port-file "$port_file" \
+		--trace-path-prefix "$trace_dir_native" &
 
 	# write PID to file
 	echo $! > "$pid_file"
@@ -78,7 +80,7 @@ kill_lttng_live_server() {
 
 get_cli_output_with_lttng_live_server() {
 	local cli_args_template="$1"
-	local server_args="$2"
+	local sessions_file="$2"
 	local cli_stdout_file="$3"
 	local cli_stderr_file="$4"
 	local port_file="$5"
@@ -102,7 +104,7 @@ get_cli_output_with_lttng_live_server() {
 	# lttng_live_server() writes its return code to the
 	# `$server_retcode_file` file.
 	lttng_live_server "$port_file" "$server_pid_file" \
-		"$server_retcode_file" "$server_args" &
+		"$server_retcode_file" "$sessions_file" &
 
 	# Get port number
 	i=0
@@ -209,7 +211,8 @@ test_list_sessions() {
 
 	local test_text="CLI prints the expected session list"
 	local cli_args_template="-i lttng-live net://localhost:@PORT@"
-	local server_args="'multi-domains,0,hostname,1,0,${trace_dir_native}/multi-domains/ust/' 'multi-domains,1,hostname,1,0,${trace_dir_native}/multi-domains/kernel/' 'trace-with-index,2,hostname,1,0,${trace_dir_native}/trace-with-index/' "
+	local sessions_file="$test_data_dir/list_sessions.json"
+	local server_args="--sessions-filename '$sessions_file'"
 
 	template_expected=$(<"$test_data_dir/cli-list-sessions.expect")
 	cli_stderr="$(mktemp -t test_live_list_sessions_stderr.XXXXXX)"
@@ -244,7 +247,8 @@ test_base() {
 	# discarded events.
 	local test_text="CLI attach and fetch from single-domains session - no discarded events"
 	local cli_args_template="-i lttng-live net://localhost:@PORT@/host/hostname/trace-with-index -c sink.text.details"
-	local server_args="'trace-with-index,0,hostname,1,0,${trace_dir_native}/trace-with-index/'"
+	local sessions_file="$test_data_dir/base.json"
+	local server_args="--sessions-filename '$sessions_file'"
 	local expected_stdout="${test_data_dir}/cli-base.expect"
 	local expected_stderr
 
@@ -261,8 +265,9 @@ test_multi_domains() {
 	# events.
 	local test_text="CLI attach and fetch from multi-domains session - discarded events"
 	local cli_args_template="-i lttng-live net://localhost:@PORT@/host/hostname/multi-domains -c sink.text.details"
-	local server_args="'multi-domains,0,hostname,1,0,${trace_dir_native}/multi-domains/kernel/,${trace_dir_native}/multi-domains/ust/'"
-	local expected_stdout="${test_data_dir}/cli-multi-domains.expect"
+	local sessions_file="${test_data_dir}/multi_domains.json"
+	local server_args="--sessions-filename '$sessions_file'"
+	local expected_stdout="$test_data_dir/cli-multi-domains.expect"
 	local expected_stderr
 
 	# Empty file for stderr expected
@@ -281,7 +286,8 @@ test_rate_limited() {
 	# The packet size of the test trace is 4k. Limit requests to 1k.
 	local test_text="CLI many requests per packet"
 	local cli_args_template="-i lttng-live net://localhost:@PORT@/host/hostname/trace-with-index -c sink.text.details"
-	local server_args="--max-query-data-response-size 1024 'trace-with-index,0,hostname,1,0,${trace_dir_native}/trace-with-index/'"
+	local sessions_file="$test_data_dir/rate_limited.json"
+	local server_args="--max-query-data-response-size 1024 --sessions-filename '$sessions_file'"
 	local expected_stdout="${test_data_dir}/cli-base.expect"
 	local expected_stderr
 
@@ -300,15 +306,17 @@ test_compare_to_ctf_fs() {
 	# that ordering is consistent between live and ctf fs.
 	local test_text="CLI src.ctf.fs vs src.ctf.lttng-live"
 	local cli_args_template="-i lttng-live net://localhost:@PORT@/host/hostname/multi-domains -c sink.text.details --params with-trace-name=false,with-stream-name=false"
-	local server_args="'multi-domains,0,hostname,1,0,${trace_dir_native}/multi-domains/kernel/' 'multi-domains,1,hostname,1,0,${trace_dir_native}/multi-domains/ust/'"
-	local server_args_inverse="'multi-domains,0,hostname,1,0,${trace_dir_native}/multi-domains/ust/' 'multi-domains,1,hostname,1,0,${trace_dir_native}/multi-domains/kernel/'"
+	local sessions_file="$test_data_dir/multi_domains.json"
+	local sessions_file_inverse="$test_data_dir/multi_domains_inverse.json"
+	local server_args="--sessions-filename '$sessions_file'"
+	local server_args_inverse="--sessions-filename '$sessions_file_inverse'"
 	local expected_stdout
 	local expected_stderr
 
 	expected_stdout="$(mktemp -t test_live_compare_stdout_expected.XXXXXX)"
 	expected_stderr="$(mktemp -t test_live_compare_stderr_expected.XXXXXX)"
 
-	bt_cli "$expected_stdout" "$expected_stderr" "${trace_dir}/multi-domains" -c sink.text.details --params "with-trace-name=false,with-stream-name=false"
+	bt_cli "$expected_stdout" "$expected_stderr" "${trace_dir}/succeed/multi-domains" -c sink.text.details --params "with-trace-name=false,with-stream-name=false"
 	bt_remove_cr "${expected_stdout}"
 	bt_remove_cr "${expected_stderr}"
 	run_test "$test_text" "$cli_args_template" "$server_args" "$expected_stdout" "$expected_stderr"