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.
This commit is contained in:
Daniel Thayer 2017-08-10 12:47:14 -05:00
parent bb14765e08
commit 7127800791
2 changed files with 5 additions and 7 deletions

View file

@ -1,5 +1,3 @@
Run 0
Run 1 Run 1
Expired: 0 --> some data Expired: 0 --> some data
Run 2 Run 2
Run 3

View file

@ -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; global data: table[int] of string &write_expire=exp_val &expire_func=expired;
redef table_expire_interval = 1sec; redef table_expire_interval = 1sec;
redef exp_val = 5sec; redef exp_val = 6sec;
global runs = 0; global runs = 0;
event do_it() event do_it()
{ {
++runs;
print fmt("Run %s", runs); print fmt("Run %s", runs);
++runs; if ( runs < 2 )
if ( runs < 4 ) schedule 4sec { do_it() };
schedule 2sec { do_it() };
else else
terminate(); terminate();
} }
@ -33,5 +33,5 @@ function expired(tbl: table[int] of string, idx: int): interval
event bro_init() &priority=-10 event bro_init() &priority=-10
{ {
data[0] = "some data"; data[0] = "some data";
schedule 2sec { do_it() }; schedule 4sec { do_it() };
} }