diff --git a/CHANGES b/CHANGES index b07a1c2823..bf08a3a9b2 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,8 @@ +3.1.0-dev.370 | 2020-01-09 19:04:59 -0800 + + * Update timeouts for a btest (Jon Siwek, Corelight) + 3.1.0-dev.368 | 2020-01-09 13:39:38 -0800 * Extend ASAN_OPTIONS in btests instead of overwrite (Jon Siwek, Corelight) diff --git a/VERSION b/VERSION index 0842d5090a..29b3715f3a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.1.0-dev.368 +3.1.0-dev.370 diff --git a/testing/btest/scripts/base/frameworks/input/missing-file-initially.zeek b/testing/btest/scripts/base/frameworks/input/missing-file-initially.zeek index 5d87c6d786..d4898ef60f 100644 --- a/testing/btest/scripts/base/frameworks/input/missing-file-initially.zeek +++ b/testing/btest/scripts/base/frameworks/input/missing-file-initially.zeek @@ -4,12 +4,12 @@ # failing behavior. # @TEST-EXEC: btest-bg-run zeek zeek %INPUT -# @TEST-EXEC: $SCRIPTS/wait-for-file zeek/init 5 || (btest-bg-wait -k 1 && false) +# @TEST-EXEC: $SCRIPTS/wait-for-file zeek/init 10 || (btest-bg-wait -k 1 && false) # @TEST-EXEC: mv does-exist.dat does-not-exist.dat -# @TEST-EXEC: $SCRIPTS/wait-for-file zeek/next 5 || (btest-bg-wait -k 1 && false) +# @TEST-EXEC: $SCRIPTS/wait-for-file zeek/next 10 || (btest-bg-wait -k 1 && false) # @TEST-EXEC: mv does-not-exist.dat does-not-exist-again.dat # @TEST-EXEC: echo "3 streaming still works" >> does-not-exist-again.dat -# @TEST-EXEC: btest-bg-wait 5 +# @TEST-EXEC: btest-bg-wait 10 # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff zeek/.stdout # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff zeek/.stderr