tests: change lttng_live_server.py's --sessions-filename to be a positional argument

[babeltrace.git] / tests / plugins / src.ctf.lttng-live / test_live

diff --git a/tests/plugins/src.ctf.lttng-live/test_live b/tests/plugins/src.ctf.lttng-live/test_live
index e1766e158653039f80a2fb0984e5f073afc97a22..c6b3c50e1cde080a4e72eed11feef8b49fb3d984 100755 (executable)
--- a/tests/plugins/src.ctf.lttng-live/test_live
+++ b/tests/plugins/src.ctf.lttng-live/test_live
@@ -5,11 +5,12 @@
 # Copyright (C) 2019 Philippe Proulx <pproulx@efficios.com>
 #
 
-# This test validates that a `src.ctf.fs` component successfully reads
-# specific CTF traces and creates the expected messages.
+# This test validates that a `src.ctf.lttng-live` component successfully does
+# various tasks that a `src.ctf.lttng-live` component is expected to do, like
+# listing tracing sessions and receiving live traces / producing the expected
+# messages out of it.
 #
-# Such CTF traces to open either exist (in `tests/ctf-traces/`)
-# or are generated by this test using local trace generators.
+# A mock LTTng live server is used to feed data to the component.
 
 SH_TAP=1
 
@@ -55,9 +56,9 @@ lttng_live_server() {
 
        # start server
        diag "$BT_TESTS_PYTHON_BIN $server_script --port-file $port_file --trace-path-prefix $trace_dir_native $server_args"
-       echo "$server_args" | xargs "$BT_TESTS_PYTHON_BIN" "$server_script" \
+       echo "$server_args" | run_python xargs "$BT_TESTS_PYTHON_BIN" "$server_script" \
                --port-file "$port_file" \
-               --trace-path-prefix "$trace_dir_native" &
+               --trace-path-prefix "$trace_dir_native" 1>&2 &
 
        # write PID to file
        echo $! > "$pid_file"
@@ -213,7 +214,7 @@ test_list_sessions() {
        local test_text="CLI prints the expected session list"
        local cli_args_template="-i lttng-live net://localhost:@PORT@"
        local sessions_file="$test_data_dir/list_sessions.json"
-       local server_args="--sessions-filename '$sessions_file'"
+       local server_args="'$sessions_file'"
 
        template_expected=$(<"$test_data_dir/cli-list-sessions.expect")
        cli_stderr="$(mktemp -t test_live_list_sessions_stderr.XXXXXX)"
@@ -249,7 +250,7 @@ test_base() {
        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 sessions_file="$test_data_dir/base.json"
-       local server_args="--sessions-filename '$sessions_file'"
+       local server_args="'$sessions_file'"
        local expected_stdout="${test_data_dir}/cli-base.expect"
        local expected_stderr
 
@@ -267,7 +268,7 @@ test_multi_domains() {
        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 sessions_file="${test_data_dir}/multi_domains.json"
-       local server_args="--sessions-filename '$sessions_file'"
+       local server_args="'$sessions_file'"
        local expected_stdout="$test_data_dir/cli-multi-domains.expect"
        local expected_stderr
 
@@ -288,7 +289,7 @@ test_rate_limited() {
        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 sessions_file="$test_data_dir/rate_limited.json"
-       local server_args="--max-query-data-response-size 1024 --sessions-filename '$sessions_file'"
+       local server_args="--max-query-data-response-size 1024 '$sessions_file'"
        local expected_stdout="${test_data_dir}/cli-base.expect"
        local expected_stderr
 
@@ -309,8 +310,8 @@ test_compare_to_ctf_fs() {
        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 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 server_args="'$sessions_file'"
+       local server_args_inverse="'$sessions_file_inverse'"
        local expected_stdout
        local expected_stderr
 
@@ -356,7 +357,7 @@ test_inactivity_discarded_packet() {
        local test_text="CLI attach and fetch from single-domains session - inactivity discarded packet"
        local cli_args_template="-i lttng-live net://localhost:@PORT@/host/hostname/7_lost_between_2_with_index -c sink.text.details"
        local sessions_file="$test_data_dir/inactivity_discarded_packet.json"
-       local server_args="--sessions-filename '$sessions_file'"
+       local server_args="'$sessions_file'"
        local expected_stdout="$test_data_dir/inactivity_discarded_packet.expect"
        local expected_stderr
 
@@ -382,7 +383,7 @@ test_split_metadata() {
        local test_text="CLI attach and fetch from single-domain session - Receive metadata in two sections separated by a empty section"
        local cli_args_template="-i lttng-live net://localhost:@PORT@/host/hostname/split_metadata -c sink.text.details"
        local sessions_file="$test_data_dir/split_metadata.json"
-       local server_args="--sessions-filename '$sessions_file'"
+       local server_args="'$sessions_file'"
        local expected_stdout="${test_data_dir}/split_metadata.expect"
        local expected_stderr