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

diff --git a/tests/plugins/src.ctf.lttng-live/test_live b/tests/plugins/src.ctf.lttng-live/test_live
index 9b44ec21..e1766e15 100755
--- a/tests/plugins/src.ctf.lttng-live/test_live
+++ b/tests/plugins/src.ctf.lttng-live/test_live
@@ -13,7 +13,7 @@
 
 SH_TAP=1
 
-if [ "x${BT_TESTS_SRCDIR:-}" != "x" ]; then
+if [ -n "${BT_TESTS_SRCDIR:-}" ]; then
 	UTILSSH="$BT_TESTS_SRCDIR/utils/utils.sh"
 else
 	UTILSSH="$(dirname "$0")/../../utils/utils.sh"
@@ -38,7 +38,7 @@ this_dir_relative="plugins/src.ctf.lttng-live"
 test_data_dir="$BT_TESTS_DATADIR/$this_dir_relative"
 trace_dir="$BT_CTF_TRACES_PATH"
 
-if [ "$BT_OS_TYPE" = "mingw" ]; then
+if [ "$BT_TESTS_OS_TYPE" = "mingw" ]; then
 	# Same as the above, but in Windows form (C:\foo\bar) instead of Unix form
 	# (/c/foo/bar).
 	trace_dir_native=$(cygpath -w "${trace_dir}")
@@ -54,6 +54,7 @@ lttng_live_server() {
 	local server_script="$test_data_dir/lttng_live_server.py"
 
 	# 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" \
 		--port-file "$port_file" \
 		--trace-path-prefix "$trace_dir_native" &
@@ -327,10 +328,78 @@ test_compare_to_ctf_fs() {
 	rm -f "$expected_stderr"
 }
 
-plan_tests 12
+test_inactivity_discarded_packet() {
+	# Attach and consume data from a multi-packet trace with discarded
+	# packets and emit an inactivity beacon during the discarded packets
+	# period.
+	#
+	# | pkt seq:0 |<-------discarded packets------>| pkt seq:8 |
+	# 0          20                                121       140
+	#
+	# This test was introduced to cover the following bug:
+	#
+	# When reading this type of trace locally, the CTF source is expected
+	# to introduce a "Discarded packets" message between packets 0 and 8.
+	# The timestamps of this message are [pkt0.end_ts, pkt8.begin_ts].
+	#
+	# In the context of a live source, the tracer could report an inactivity
+	# period during the interval of the "Discarded packets" message.
+	# Those messages eventually translate into a
+	# "Iterator inactivity" message with a timestamp set at the end of the
+	# inactivity period.
+	#
+	# If the tracer reports an inactivity period that ends at a point
+	# between pkt0 and pkt7 (resulting in an "Iterator inactivity" message),
+	# the live source could send a "Discarded packets" message that starts
+	# before the preceding "Iterator inactivity" message. This would break
+	# 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-filename '$sessions_file'"
+	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"
+
+	rm -f "$expected_stderr"
+}
+
+test_split_metadata() {
+	# Consume a metadata stream sent in two parts. This testcase tests the
+	# behaviour of Babeltrace when the tracing session was cleared (lttng
+	# clear) but the metadata is not yet available to the relay. In such
+	# cases, when asked for metadata, the relay will return the
+	# `LTTNG_VIEWER_METADATA_OK` status and a data length of 0. The viewer
+	# need to consider such case as a request to retry fetching metadata.
+	#
+	# This testcase emulates such behaviour by adding empty metadata
+	# packets.
+
+	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 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"
+
+	rm -f "$expected_stderr"
+}
+
+plan_tests 16
 
 test_list_sessions
 test_base
 test_multi_domains
 test_rate_limited
 test_compare_to_ctf_fs
+test_inactivity_discarded_packet
+test_split_metadata