From: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Date: Tue, 11 Jun 2019 09:39:46 +0000 (-0400)
Subject: Tests: remove check for an empty chunk produced on destruction
X-Git-Tag: v2.12.0-rc1~553
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=7304cc2e1edc7980831ea2e95bd7047f4dcc22f0;p=lttng-tools.git

Tests: remove check for an empty chunk produced on destruction

Consider the following tracing scenario used by the rotation tests:
  - Start tracing
  - Rotate
  - Stop tracing
  - Rotate
  - Destroy

The session daemon used to produce 3 trace archives when this sequence
of operations occurred. Of course, the third archive would always be
empty as no events can be produced between a stop and a destroy
operation.

As this behaviour is thankfully no longer present, the chunk
validation logic of the test causes it to fail. This patch removes
this logic.

Moreover, since chunk IDs are now 0-based, the test is adjusted to
check for names accouting for this naming scheme.

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---

diff --git a/tests/regression/tools/rotation/rotate_utils.sh b/tests/regression/tools/rotation/rotate_utils.sh
index 3cd9fab6f..8179f7d15 100644
--- a/tests/regression/tools/rotation/rotate_utils.sh
+++ b/tests/regression/tools/rotation/rotate_utils.sh
@@ -61,29 +61,20 @@ function validate_test_chunks ()
 	# Enable extglob for the use of chunk_pattern
 	shopt -s extglob
 
-	# Validate that only 3 chunks are present
+	# Validate that only 2 chunks are present
 	nb_chunk=$(ls -A $local_path | wc -l)
-	test $nb_chunk -eq 3
-	ok $? "${local_path} contains 3 chunks only"
+	test $nb_chunk -eq 2
+	ok $? "${local_path} contains 2 chunks only"
 
 	# Check if the first and second chunk folders exist and they contain a ${app_path}/metadata file.
-	for chunk in $(seq 1 2); do
+	for chunk in $(seq 0 1); do
 		path=$(ls $local_path/${chunk_pattern}-${chunk}/${app_path}/metadata)
 		ok $? "Chunk ${chunk} exists based on path $path"
 	done
 
-	# In per-pid the last chunk (3) must be empty.
-	if [ "${per_pid}" -eq "1" ]; then
-		test -z "$(ls -A $local_path/${chunk_pattern}-3/${domain})"
-		ok $? "Chunk 3 is empty per-pid mode"
-	else
-		path=$(ls $local_path/${chunk_pattern}-3/${app_path}/metadata)
-		ok $? "Chunk 3 exists based on path $path"
-	fi
-
 	# Make sure we don't have anything else in the first 2 chunk directories
 	# besides the kernel folder.
-	for chunk in $(seq 1 2); do
+	for chunk in $(seq 0 1); do
 		nr_stale=$(ls -A $local_path/${chunk_pattern}-${chunk} | grep -v $domain | wc -l)
 		ok $nr_stale "No stale folders in chunk ${chunk} directory"
 	done
@@ -92,17 +83,11 @@ function validate_test_chunks ()
 	validate_trace_count $EVENT_NAME $local_path 30
 
 	# Chunk 1: 10 events
-	validate_trace_count $EVENT_NAME $local_path/${chunk_pattern}-1 10
+	validate_trace_count $EVENT_NAME $local_path/${chunk_pattern}-0 10
 
 	# Chunk 2: 20 events
-	validate_trace_count $EVENT_NAME $local_path/${chunk_pattern}-2 20
+	validate_trace_count $EVENT_NAME $local_path/${chunk_pattern}-1 20
 
-	# Chunk 3: 0 event
-	# Trace for chunk number 3 can only be read in per-uid mode since in
-	# per-pid mode it is empty (no metadata or stream files).
-	if test $per_pid = 0; then
-		validate_trace_empty $local_path/${chunk_pattern}-3
-	fi
 	shopt -u extglob
 }