tests: pass live server args down using arrays

Pass arguments to lttng_live_server.py all the way down using arrays.

Change-Id: I9efd02539fd7c790bb941069bceadb7b7f5315a2
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/10918
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
Tested-by: jenkins <jenkins@lttng.org>

diff --git a/tests/plugins/src.ctf.lttng-live/test_live b/tests/plugins/src.ctf.lttng-live/test_live
index cb4cfc0f7d1f46ce96d42e986f8b97139d56da84..32e714f2cdb8907c689de6dbbe3f09128819ec1f 100755 (executable)
--- a/tests/plugins/src.ctf.lttng-live/test_live
+++ b/tests/plugins/src.ctf.lttng-live/test_live
@@ -48,15 +48,16 @@ else
 fi
 
 lttng_live_server() {
-       local port_file="$1"
-       local pid_file="$2"
-       local retcode_file="$3"
-       local server_args="$4"
+       local pid_file="$1"
+       local retcode_file="$2"
+       shift 2
+       local server_args=("$@")
+
        local server_script="$test_data_dir/lttng_live_server.py"
 
        # start server
-       diag "$BT_TESTS_PYTHON_BIN $server_script $server_args"
-       echo "$server_args" | run_python xargs "$BT_TESTS_PYTHON_BIN" "$server_script" 1>&2 &
+       diag "$BT_TESTS_PYTHON_BIN $server_script ${server_args[*]}"
+       run_python "$BT_TESTS_PYTHON_BIN" "$server_script" "${server_args[@]}" 1>&2 &
 
        # write PID to file
        echo $! > "$pid_file"
@@ -80,10 +81,11 @@ kill_lttng_live_server() {
 
 get_cli_output_with_lttng_live_server() {
        local cli_args_template="$1"
-       local server_args="$2"
-       local cli_stdout_file="$3"
-       local cli_stderr_file="$4"
-       local port_file="$5"
+       local cli_stdout_file="$2"
+       local cli_stderr_file="$3"
+       local port_file="$4"
+       shift 4
+       local server_args=("$@")
 
        local i
        local ret
@@ -91,8 +93,8 @@ get_cli_output_with_lttng_live_server() {
        local cli_args
        local server_pid_file
        local server_retcode_file
-       
-       server_args="--port-file $port_file --trace-path-prefix \"$trace_dir_native\" $server_args"
+
+       server_args+=(--port-file "$port_file" --trace-path-prefix "$trace_dir_native")
        server_pid_file="$(mktemp -t test_live_server_pid.XXXXXX)"
        server_retcode_file="$(mktemp -t test_live_server_ret.XXXXX)"
 
@@ -104,8 +106,7 @@ get_cli_output_with_lttng_live_server() {
        # `$server_pid_file` file. When the server exits,
        # 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" &
+       lttng_live_server "$server_pid_file" "$server_retcode_file" "${server_args[@]}" &
 
        # Get port number
        i=0
@@ -173,9 +174,10 @@ get_cli_output_with_lttng_live_server() {
 run_test() {
        local test_text="$1"
        local cli_args_template="$2"
-       local server_args="$3"
-       local expected_stdout="$4"
-       local expected_stderr="$5"
+       local expected_stdout="$3"
+       local expected_stderr="$4"
+       shift 4
+       local server_args=("$@")
 
        local cli_stderr
        local cli_stdout
@@ -186,7 +188,8 @@ run_test() {
        cli_stdout="$(mktemp -t test_live_stdout.XXXXXX)"
        port_file="$(mktemp -t test_live_server_port.XXXXXX)"
 
-       get_cli_output_with_lttng_live_server "$cli_args_template" "$server_args" "$cli_stdout" "$cli_stderr" "$port_file"
+       get_cli_output_with_lttng_live_server "$cli_args_template" "$cli_stdout" \
+               "$cli_stderr" "$port_file" "${server_args[@]}"
        port=$(<"$port_file")
 
        bt_diff "$expected_stdout" "$cli_stdout"
@@ -212,8 +215,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_file'"
+       local server_args=("$test_data_dir/list_sessions.json")
 
        template_expected=$(<"$test_data_dir/cli-list-sessions.expect")
        cli_stderr="$(mktemp -t test_live_list_sessions_stderr.XXXXXX)"
@@ -222,7 +224,8 @@ test_list_sessions() {
        port_file="$(mktemp -t test_live_list_sessions_server_port.XXXXXX)"
        tmp_stdout_expected="$(mktemp -t test_live_list_sessions_stdout_expected.XXXXXX)"
 
-       get_cli_output_with_lttng_live_server "$cli_args_template" "$server_args" "$cli_stdout" "$cli_stderr" "$port_file"
+       get_cli_output_with_lttng_live_server "$cli_args_template" "$cli_stdout" \
+               "$cli_stderr" "$port_file" "${server_args[@]}"
        port=$(<"$port_file")
 
        # Craft the expected output. This is necessary since the port number
@@ -248,15 +251,15 @@ 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 sessions_file="$test_data_dir/base.json"
-       local server_args="'$sessions_file'"
+       local server_args=("$test_data_dir/base.json")
        local expected_stdout="${test_data_dir}/cli-base.expect"
        local expected_stderr
 
        # Empty file for stderr expected
        expected_stderr="$(mktemp -t test_live_base_stderr_expected.XXXXXX)"
 
-       run_test "$test_text" "$cli_args_template" "$server_args" "$expected_stdout" "$expected_stderr"
+       run_test "$test_text" "$cli_args_template" "$expected_stdout" \
+               "$expected_stderr" "${server_args[@]}"
 
        rm -f "$expected_stderr"
 }
@@ -266,15 +269,15 @@ 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 sessions_file="${test_data_dir}/multi_domains.json"
-       local server_args="'$sessions_file'"
+       local server_args=("${test_data_dir}/multi_domains.json")
        local expected_stdout="$test_data_dir/cli-multi-domains.expect"
        local expected_stderr
 
        # Empty file for stderr expected
        expected_stderr="$(mktemp -t test_live_multi_domains_stderr_expected.XXXXXX)"
 
-       run_test "$test_text" "$cli_args_template" "$server_args" "$expected_stdout" "$expected_stderr"
+       run_test "$test_text" "$cli_args_template" "$expected_stdout" \
+               "$expected_stderr" "${server_args[@]}"
 
        rm -f "$expected_stderr"
 }
@@ -287,15 +290,15 @@ 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 sessions_file="$test_data_dir/rate_limited.json"
-       local server_args="--max-query-data-response-size 1024 '$sessions_file'"
+       local server_args=(--max-query-data-response-size 1024 "$test_data_dir/rate_limited.json")
        local expected_stdout="${test_data_dir}/cli-base.expect"
        local expected_stderr
 
        # Empty file for stderr expected
        expected_stderr="$(mktemp -t test_live_rate_limited_stderr_expected.XXXXXX)"
 
-       run_test "$test_text" "$cli_args_template" "$server_args" "$expected_stdout" "$expected_stderr"
+       run_test "$test_text" "$cli_args_template" "$expected_stdout" \
+               "$expected_stderr" "${server_args[@]}"
 
        rm -f "$expected_stderr"
 }
@@ -307,10 +310,8 @@ 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 sessions_file="$test_data_dir/multi_domains.json"
-       local sessions_file_inverse="$test_data_dir/multi_domains_inverse.json"
-       local server_args="'$sessions_file'"
-       local server_args_inverse="'$sessions_file_inverse'"
+       local server_args=("$test_data_dir/multi_domains.json")
+       local server_args_inverse=("$test_data_dir/multi_domains_inverse.json")
        local expected_stdout
        local expected_stderr
 
@@ -320,9 +321,11 @@ test_compare_to_ctf_fs() {
        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"
+       run_test "$test_text" "$cli_args_template" "$expected_stdout" \
+               "$expected_stderr" "${server_args[@]}"
        diag "Inverse session order from lttng-relayd"
-       run_test "$test_text" "$cli_args_template" "$server_args_inverse" "$expected_stdout" "$expected_stderr"
+       run_test "$test_text" "$cli_args_template" "$expected_stdout" \
+               "$expected_stderr" "${server_args_inverse[@]}"
 
        rm -f "$expected_stdout"
        rm -f "$expected_stderr"
@@ -355,15 +358,15 @@ test_inactivity_discarded_packet() {
        # the monotonicity constraint of the graph.
        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_file'"
+       local server_args=("$test_data_dir/inactivity_discarded_packet.json")
        local expected_stdout="$test_data_dir/inactivity_discarded_packet.expect"
        local expected_stderr
 
        # Empty file for stderr expected
        expected_stderr="$(mktemp -t test_live_inactivity_discarded_packet_stderr_expected.XXXXXX)"
 
-       run_test "$test_text" "$cli_args_template" "$server_args" "$expected_stdout" "$expected_stderr"
+       run_test "$test_text" "$cli_args_template" "$expected_stdout" \
+               "$expected_stderr" "${server_args[@]}"
 
        rm -f "$expected_stderr"
 }
@@ -381,15 +384,15 @@ 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_file'"
+       local server_args=("$test_data_dir/split_metadata.json")
        local expected_stdout="${test_data_dir}/split_metadata.expect"
        local expected_stderr
 
        # Empty file for stderr expected
        expected_stderr="$(mktemp -t test_live_split_metadata_stderr_expected.XXXXXX)"
 
-       run_test "$test_text" "$cli_args_template" "$server_args" "$expected_stdout" "$expected_stderr"
+       run_test "$test_text" "$cli_args_template" "$expected_stdout" \
+               "$expected_stderr" "${server_args[@]}"
 
        rm -f "$expected_stderr"
 }