Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 06:38:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge remote-tracking branch 'origin/topic/awelzel/4312-paper-over-flakiness-through-sleep'

Browse source 
* origin/topic/awelzel/4312-paper-over-flakiness-through-sleep:
  btest/brokerstore-attr-persistence-clone: Add BTEST_BG_RUN_SLEEP=1
This commit is contained in:
Arne Welzel 2025-04-09 18:11:08 +02:00
commit c0f2ba468d
3 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGES
View file

@ -1,3 +1,7 @@
7.2.0-dev.499 | 2025-04-09 18:11:08 +0200
* btest/brokerstore-attr-persistence-clone: Add BTEST_BG_RUN_SLEEP=1 (Arne Welzel, Corelight)
7.2.0-dev.497 | 2025-04-08 11:30:53 -0700
* Add move assignment operator to ZeekString, which already had a move constructor (Tim Wojtulewicz, Corelight)

2
VERSION
View file

@ -1 +1 @@
7.2.0-dev.497
7.2.0-dev.499

8
testing/btest/broker/store/brokerstore-attr-persistence-clone.zeek
View file

@ -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