From 712780079191d0decf83a8e8c268e8da34d7248d Mon Sep 17 00:00:00 2001 From: Daniel Thayer Date: Thu, 10 Aug 2017 12:47:14 -0500 Subject: [PATCH] Fix the expire-redef.bro test The expire-redef.bro test was sometimes failing due to the second "Run" message being printed after (should happen before) the "Expired" message. Fixed by increasing the time interval between events. Also reduced the number of events raised to make the test finish more quickly. --- testing/btest/Baseline/language.expire-redef/output | 2 -- testing/btest/language/expire-redef.bro | 10 +++++----- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/testing/btest/Baseline/language.expire-redef/output b/testing/btest/Baseline/language.expire-redef/output index d5a745e7f3..42bb1b485c 100644 --- a/testing/btest/Baseline/language.expire-redef/output +++ b/testing/btest/Baseline/language.expire-redef/output @@ -1,5 +1,3 @@ -Run 0 Run 1 Expired: 0 --> some data Run 2 -Run 3 diff --git a/testing/btest/language/expire-redef.bro b/testing/btest/language/expire-redef.bro index 6bf43ae98a..5cbb00f313 100644 --- a/testing/btest/language/expire-redef.bro +++ b/testing/btest/language/expire-redef.bro @@ -9,16 +9,16 @@ global expired: function(tbl: table[int] of string, idx: int): interval; global data: table[int] of string &write_expire=exp_val &expire_func=expired; redef table_expire_interval = 1sec; -redef exp_val = 5sec; +redef exp_val = 6sec; global runs = 0; event do_it() { + ++runs; print fmt("Run %s", runs); - ++runs; - if ( runs < 4 ) - schedule 2sec { do_it() }; + if ( runs < 2 ) + schedule 4sec { do_it() }; else terminate(); } @@ -33,5 +33,5 @@ function expired(tbl: table[int] of string, idx: int): interval event bro_init() &priority=-10 { data[0] = "some data"; - schedule 2sec { do_it() }; + schedule 4sec { do_it() }; }