From fa7ffaf8c197b67d322dde4a658efa2a16626340 Mon Sep 17 00:00:00 2001 From: Arne Welzel Date: Fri, 4 Apr 2025 15:57:44 +0200 Subject: [PATCH] btest/brokerstore-attr-persistence-clone: Add BTEST_BG_RUN_SLEEP=1 This test has become flaky after #4295. It hasn't been failing regularly enough locally to make it approachable. Annotate with BTEST_BG_RUN_SLEEP=1 to revert to pre #4295 behavior, hopefully fixing the flakiness as a side-effect. --- .../broker/store/brokerstore-attr-persistence-clone.zeek | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/testing/btest/broker/store/brokerstore-attr-persistence-clone.zeek b/testing/btest/broker/store/brokerstore-attr-persistence-clone.zeek index d279b100ee..8903c5b89a 100644 --- a/testing/btest/broker/store/brokerstore-attr-persistence-clone.zeek +++ b/testing/btest/broker/store/brokerstore-attr-persistence-clone.zeek @@ -1,8 +1,12 @@ # @TEST-PORT: BROKER_PORT # @TEST-EXEC: zeek -b %DIR/sort-stuff.zeek common.zeek one.zeek > output1 -# @TEST-EXEC: btest-bg-run master "cp ../*.sqlite . && zeek -b %DIR/sort-stuff.zeek ../common.zeek ../two.zeek >../output2" -# @TEST-EXEC: btest-bg-run clone "zeek -b %DIR/sort-stuff.zeek ../common.zeek ../three.zeek >../output3" +# +# This test becomes flaky when not sleeping for a second after starting the +# test. Due to that, we set BTEST_BG_RUN_SLEEP=1 explicitly. See #4312 and +# #4295 for background. +# @TEST-EXEC: BTEST_BG_RUN_SLEEP=1 btest-bg-run master "cp ../*.sqlite . && zeek -b %DIR/sort-stuff.zeek ../common.zeek ../two.zeek >../output2" +# @TEST-EXEC: BTEST_BG_RUN_SLEEP=1 btest-bg-run clone "zeek -b %DIR/sort-stuff.zeek ../common.zeek ../three.zeek >../output3" # @TEST-EXEC: btest-bg-wait 20 # @TEST-EXEC: btest-diff output1