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

Trick for parallelizing input framework unit tests.

Browse source 
Instead of loading listen.bro to block until files are read, just read
a pcap file in pseudo-realtime.  Seems to work well.
This commit is contained in:
Jon Siwek 2012-12-11 17:06:54 -06:00
parent aff5898442
commit 43ed437daa
36 changed files with 50 additions and 210 deletions
Download patch file Download diff file Expand all files Collapse all files

14
testing/btest/Baseline/scripts.base.frameworks.input.invalidnumbers/.stderrwithoutfirstline
View file

@ -1,8 +1,8 @@
error: ../input.log/Input::READER_ASCII: Number '12129223372036854775800' out of supported range. 1355266097.683599 error: ../input.log/Input::READER_ASCII: Number '12129223372036854775800' out of supported range.
error: ../input.log/Input::READER_ASCII: Could not convert line '12129223372036854775800 121218446744073709551612' to Val. Ignoring line. 1355266097.683599 error: ../input.log/Input::READER_ASCII: Could not convert line '12129223372036854775800 121218446744073709551612' to Val. Ignoring line.
warning: ../input.log/Input::READER_ASCII: Number '9223372036854775801TEXTHERE' contained non-numeric trailing characters. Ignored trailing characters 'TEXTHERE' 1355266097.683599 warning: ../input.log/Input::READER_ASCII: Number '9223372036854775801TEXTHERE' contained non-numeric trailing characters. Ignored trailing characters 'TEXTHERE'
warning: ../input.log/Input::READER_ASCII: Number '1Justtext' contained non-numeric trailing characters. Ignored trailing characters 'Justtext' 1355266097.683599 warning: ../input.log/Input::READER_ASCII: Number '1Justtext' contained non-numeric trailing characters. Ignored trailing characters 'Justtext'
error: ../input.log/Input::READER_ASCII: String 'Justtext' contained no parseable number 1355266097.683599 error: ../input.log/Input::READER_ASCII: String 'Justtext' contained no parseable number
error: ../input.log/Input::READER_ASCII: Could not convert line 'Justtext 1' to Val. Ignoring line. 1355266097.683599 error: ../input.log/Input::READER_ASCII: Could not convert line 'Justtext 1' to Val. Ignoring line.
received termination signal 1355266097.683599 received termination signal
>>> >>>

6
testing/btest/Baseline/scripts.base.frameworks.input.invalidtext/.stderrwithoutfirstline
View file

@ -1,4 +1,4 @@
error: ../input.log/Input::READER_ASCII: String 'l' contained no parseable number 1355265853.593476 error: ../input.log/Input::READER_ASCII: String 'l' contained no parseable number
error: ../input.log/Input::READER_ASCII: Could not convert line ' l' to Val. Ignoring line. 1355265853.593476 error: ../input.log/Input::READER_ASCII: Could not convert line ' l' to Val. Ignoring line.
received termination signal 1355265853.593476 received termination signal
>>> >>>

10
testing/btest/Baseline/scripts.base.frameworks.input.missing-file/bro..stderr
View file

@ -1,5 +1,5 @@
error: does-not-exist.dat/Input::READER_ASCII: Init: cannot open does-not-exist.dat 1355265996.626106 error: does-not-exist.dat/Input::READER_ASCII: Init: cannot open does-not-exist.dat
error: does-not-exist.dat/Input::READER_ASCII: Init failed 1355265996.626106 error: does-not-exist.dat/Input::READER_ASCII: Init failed
warning: Stream input is already queued for removal. Ignoring remove. 1355265996.626106 warning: Stream input is already queued for removal. Ignoring remove.
error: does-not-exist.dat/Input::READER_ASCII: terminating thread 1355265996.626106 error: does-not-exist.dat/Input::READER_ASCII: terminating thread
received termination signal 1355265996.626106 received termination signal

6
testing/btest/scripts/base/frameworks/input/basic.bro
View file

@ -1,7 +1,4 @@
# (uses listen.bro just to ensure input sources are more reliably fully-read). # @TEST-EXEC: btest-bg-run bro bro -b --pseudo-realtime -r $TRACES/socks.trace %INPUT
# @TEST-SERIALIZE: comm
#
# @TEST-EXEC: btest-bg-run bro bro -b %INPUT
# @TEST-EXEC: btest-bg-wait -k 5 # @TEST-EXEC: btest-bg-wait -k 5
# @TEST-EXEC: btest-diff out # @TEST-EXEC: btest-diff out
@ -14,7 +11,6 @@ T -42 SSH::LOG 21 123 10.0.0.0/24 1.2.3.4 3.14 1315801931.273616 100.000000 hurz
@TEST-END-FILE @TEST-END-FILE
@load base/protocols/ssh @load base/protocols/ssh
@load frameworks/communication/listen
global outfile: file; global outfile: file;

7
testing/btest/scripts/base/frameworks/input/bignumber.bro
View file

@ -1,7 +1,4 @@
# (uses listen.bro just to ensure input sources are more reliably fully-read). # @TEST-EXEC: btest-bg-run bro bro -b --pseudo-realtime -r $TRACES/socks.trace %INPUT
# @TEST-SERIALIZE: comm
#
# @TEST-EXEC: btest-bg-run bro bro -b %INPUT
# @TEST-EXEC: btest-bg-wait -k 5 # @TEST-EXEC: btest-bg-wait -k 5
# @TEST-EXEC: btest-diff out # @TEST-EXEC: btest-diff out
@ -13,8 +10,6 @@
-9223372036854775800 18446744073709551612 -9223372036854775800 18446744073709551612
@TEST-END-FILE @TEST-END-FILE
@load frameworks/communication/listen
global outfile: file; global outfile: file;
module A; module A;

7
testing/btest/scripts/base/frameworks/input/binary.bro
View file

@ -1,7 +1,4 @@
# (uses listen.bro just to ensure input sources are more reliably fully-read). # @TEST-EXEC: btest-bg-run bro bro -b --pseudo-realtime -r $TRACES/socks.trace %INPUT
# @TEST-SERIALIZE: comm
#
# @TEST-EXEC: btest-bg-run bro bro -b %INPUT
# @TEST-EXEC: btest-bg-wait -k 5 # @TEST-EXEC: btest-bg-wait -k 5
# @TEST-EXEC: btest-diff out # @TEST-EXEC: btest-diff out
@ -25,8 +22,6 @@ abc\xff\x7cdef|DATA2
#end|2012-07-20-01-49-19 #end|2012-07-20-01-49-19
@TEST-END-FILE @TEST-END-FILE
@load frameworks/communication/listen
global outfile: file; global outfile: file;
global try: count; global try: count;

8
testing/btest/scripts/base/frameworks/input/empty-values-hashing.bro
View file

@ -1,8 +1,5 @@
# (uses listen.bro just to ensure input sources are more reliably fully-read).
# @TEST-SERIALIZE: comm
#
# @TEST-EXEC: cp input1.log input.log # @TEST-EXEC: cp input1.log input.log
# @TEST-EXEC: btest-bg-run bro bro -b %INPUT # @TEST-EXEC: btest-bg-run bro bro -b --pseudo-realtime -r $TRACES/socks.trace %INPUT
# @TEST-EXEC: sleep 2 # @TEST-EXEC: sleep 2
# @TEST-EXEC: cp input2.log input.log # @TEST-EXEC: cp input2.log input.log
# @TEST-EXEC: btest-bg-wait -k 5 # @TEST-EXEC: btest-bg-wait -k 5
@ -23,9 +20,6 @@
2 TEST TEST 2 TEST TEST
@TEST-END-FILE @TEST-END-FILE
@load frameworks/communication/listen
module A; module A;
type Idx: record { type Idx: record {

7
testing/btest/scripts/base/frameworks/input/emptyvals.bro
View file

@ -1,7 +1,4 @@
# (uses listen.bro just to ensure input sources are more reliably fully-read). # @TEST-EXEC: btest-bg-run bro bro -b --pseudo-realtime -r $TRACES/socks.trace %INPUT
# @TEST-SERIALIZE: comm
#
# @TEST-EXEC: btest-bg-run bro bro -b %INPUT
# @TEST-EXEC: btest-bg-wait -k 5 # @TEST-EXEC: btest-bg-wait -k 5
# @TEST-EXEC: btest-diff out # @TEST-EXEC: btest-diff out
@ -14,8 +11,6 @@ T 1
- 2 - 2
@TEST-END-FILE @TEST-END-FILE
@load frameworks/communication/listen
global outfile: file; global outfile: file;
redef InputAscii::empty_field = "EMPTY"; redef InputAscii::empty_field = "EMPTY";

7
testing/btest/scripts/base/frameworks/input/event.bro
View file

@ -1,7 +1,4 @@
# (uses listen.bro just to ensure input sources are more reliably fully-read). # @TEST-EXEC: btest-bg-run bro bro -b --pseudo-realtime -r $TRACES/socks.trace %INPUT
# @TEST-SERIALIZE: comm
#
# @TEST-EXEC: btest-bg-run bro bro -b %INPUT
# @TEST-EXEC: btest-bg-wait -k 5 # @TEST-EXEC: btest-bg-wait -k 5
# @TEST-EXEC: btest-diff out # @TEST-EXEC: btest-diff out
@ -19,8 +16,6 @@
7 T 7 T
@TEST-END-FILE @TEST-END-FILE
@load frameworks/communication/listen
global outfile: file; global outfile: file;
module A; module A;

7
testing/btest/scripts/base/frameworks/input/executeraw.bro
View file

@ -1,7 +1,4 @@
# (uses listen.bro just to ensure input sources are more reliably fully-read). # @TEST-EXEC: btest-bg-run bro bro -b --pseudo-realtime -r $TRACES/socks.trace %INPUT
# @TEST-SERIALIZE: comm
#
# @TEST-EXEC: btest-bg-run bro bro -b %INPUT
# @TEST-EXEC: btest-bg-wait -k 5 # @TEST-EXEC: btest-bg-wait -k 5
# @TEST-EXEC: cat out.tmp | sed 's/^ *//g' >out # @TEST-EXEC: cat out.tmp | sed 's/^ *//g' >out
# @TEST-EXEC: btest-diff out # @TEST-EXEC: btest-diff out
@ -17,8 +14,6 @@ sdf
3rw43wRRERLlL#RWERERERE. 3rw43wRRERLlL#RWERERERE.
@TEST-END-FILE @TEST-END-FILE
@load frameworks/communication/listen
global outfile: file; global outfile: file;
type Val: record { type Val: record {

9
testing/btest/scripts/base/frameworks/input/invalidnumbers.bro
View file

@ -1,11 +1,8 @@
# (uses listen.bro just to ensure input sources are more reliably fully-read). # @TEST-EXEC: btest-bg-run bro bro -b --pseudo-realtime -r $TRACES/socks.trace %INPUT
# @TEST-SERIALIZE: comm
#
# @TEST-EXEC: btest-bg-run bro bro -b %INPUT
# @TEST-EXEC: btest-bg-wait -k 5 # @TEST-EXEC: btest-bg-wait -k 5
# @TEST-EXEC: btest-diff out # @TEST-EXEC: btest-diff out
# @TEST-EXEC: sed 1d .stderr > .stderrwithoutfirstline # @TEST-EXEC: sed 1d .stderr > .stderrwithoutfirstline
# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff .stderrwithoutfirstline # @TEST-EXEC: TEST_DIFF_CANONIFIER="$SCRIPTS/diff-remove-abspath | $SCRIPTS/diff-remove-timestamps" btest-diff .stderrwithoutfirstline
@TEST-START-FILE input.log @TEST-START-FILE input.log
#separator \x09 #separator \x09
@ -17,8 +14,6 @@ Justtext 1
9223372036854775800 -18446744073709551612 9223372036854775800 -18446744073709551612
@TEST-END-FILE @TEST-END-FILE
@load frameworks/communication/listen
global outfile: file; global outfile: file;
module A; module A;

9
testing/btest/scripts/base/frameworks/input/invalidtext.bro
View file

@ -1,11 +1,8 @@
# (uses listen.bro just to ensure input sources are more reliably fully-read). # @TEST-EXEC: btest-bg-run bro bro -b --pseudo-realtime -r $TRACES/socks.trace %INPUT
# @TEST-SERIALIZE: comm
#
# @TEST-EXEC: btest-bg-run bro bro -b %INPUT
# @TEST-EXEC: btest-bg-wait -k 5 # @TEST-EXEC: btest-bg-wait -k 5
# @TEST-EXEC: btest-diff out # @TEST-EXEC: btest-diff out
# @TEST-EXEC: sed 1d .stderr > .stderrwithoutfirstline # @TEST-EXEC: sed 1d .stderr > .stderrwithoutfirstline
# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff .stderrwithoutfirstline # @TEST-EXEC: TEST_DIFF_CANONIFIER="$SCRIPTS/diff-remove-abspath | $SCRIPTS/diff-remove-timestamps" btest-diff .stderrwithoutfirstline
@TEST-START-FILE input.log @TEST-START-FILE input.log
#separator \x09 #separator \x09
@ -15,8 +12,6 @@
5 5
@TEST-END-FILE @TEST-END-FILE
@load frameworks/communication/listen
global outfile: file; global outfile: file;
module A; module A;

7
testing/btest/scripts/base/frameworks/input/missing-file.bro
View file

@ -1,12 +1,7 @@
# (uses listen.bro just to ensure input sources are more reliably fully-read). # @TEST-EXEC: btest-bg-run bro bro -b --pseudo-realtime -r $TRACES/socks.trace %INPUT
# @TEST-SERIALIZE: comm
#
# @TEST-EXEC: btest-bg-run bro bro -b %INPUT
# @TEST-EXEC: btest-bg-wait -k 5 # @TEST-EXEC: btest-bg-wait -k 5
# @TEST-EXEC: btest-diff bro/.stderr # @TEST-EXEC: btest-diff bro/.stderr
@load frameworks/communication/listen
global outfile: file; global outfile: file;
global try: count; global try: count;

7
testing/btest/scripts/base/frameworks/input/onecolumn-norecord.bro
View file

@ -1,7 +1,4 @@
# (uses listen.bro just to ensure input sources are more reliably fully-read). # @TEST-EXEC: btest-bg-run bro bro -b --pseudo-realtime -r $TRACES/socks.trace %INPUT
# @TEST-SERIALIZE: comm
#
# @TEST-EXEC: btest-bg-run bro bro -b %INPUT
# @TEST-EXEC: btest-bg-wait -k 5 # @TEST-EXEC: btest-bg-wait -k 5
# @TEST-EXEC: btest-diff out # @TEST-EXEC: btest-diff out
@ -13,8 +10,6 @@
T -42 T -42
@TEST-END-FILE @TEST-END-FILE
@load frameworks/communication/listen
global outfile: file; global outfile: file;
redef InputAscii::empty_field = "EMPTY"; redef InputAscii::empty_field = "EMPTY";

7
testing/btest/scripts/base/frameworks/input/onecolumn-record.bro
View file

@ -1,7 +1,4 @@
# (uses listen.bro just to ensure input sources are more reliably fully-read). # @TEST-EXEC: btest-bg-run bro bro -b --pseudo-realtime -r $TRACES/socks.trace %INPUT
# @TEST-SERIALIZE: comm
#
# @TEST-EXEC: btest-bg-run bro bro -b %INPUT
# @TEST-EXEC: btest-bg-wait -k 5 # @TEST-EXEC: btest-bg-wait -k 5
# @TEST-EXEC: btest-diff out # @TEST-EXEC: btest-diff out
@ -13,8 +10,6 @@
T -42 T -42
@TEST-END-FILE @TEST-END-FILE
@load frameworks/communication/listen
global outfile: file; global outfile: file;
redef InputAscii::empty_field = "EMPTY"; redef InputAscii::empty_field = "EMPTY";

7
testing/btest/scripts/base/frameworks/input/optional.bro
View file

@ -1,7 +1,4 @@
# (uses listen.bro just to ensure input sources are more reliably fully-read). # @TEST-EXEC: btest-bg-run bro bro -b --pseudo-realtime -r $TRACES/socks.trace %INPUT
# @TEST-SERIALIZE: comm
#
# @TEST-EXEC: btest-bg-run bro bro -b %INPUT
# @TEST-EXEC: btest-bg-wait -k 5 # @TEST-EXEC: btest-bg-wait -k 5
# @TEST-EXEC: btest-diff out # @TEST-EXEC: btest-diff out
@ -19,8 +16,6 @@
7 T 7 T
@TEST-END-FILE @TEST-END-FILE
@load frameworks/communication/listen
global outfile: file; global outfile: file;
redef InputAscii::empty_field = "EMPTY"; redef InputAscii::empty_field = "EMPTY";

7
testing/btest/scripts/base/frameworks/input/port.bro
View file

@ -1,7 +1,4 @@
# (uses listen.bro just to ensure input sources are more reliably fully-read). # @TEST-EXEC: btest-bg-run bro bro -b --pseudo-realtime -r $TRACES/socks.trace %INPUT
# @TEST-SERIALIZE: comm
#
# @TEST-EXEC: btest-bg-run bro bro -b %INPUT
# @TEST-EXEC: btest-bg-wait -k 5 # @TEST-EXEC: btest-bg-wait -k 5
# @TEST-EXEC: btest-diff out # @TEST-EXEC: btest-diff out
@ -12,8 +9,6 @@
1.2.3.6 30 unknown 1.2.3.6 30 unknown
@TEST-END-FILE @TEST-END-FILE
@load frameworks/communication/listen
global outfile: file; global outfile: file;
redef InputAscii::empty_field = "EMPTY"; redef InputAscii::empty_field = "EMPTY";

7
testing/btest/scripts/base/frameworks/input/predicate-stream.bro
View file

@ -1,7 +1,4 @@
# (uses listen.bro just to ensure input sources are more reliably fully-read). # @TEST-EXEC: btest-bg-run bro bro -b --pseudo-realtime -r $TRACES/socks.trace %INPUT
# @TEST-SERIALIZE: comm
#
# @TEST-EXEC: btest-bg-run bro bro -b %INPUT
# @TEST-EXEC: btest-bg-wait -k 5 # @TEST-EXEC: btest-bg-wait -k 5
# @TEST-EXEC: btest-diff out # @TEST-EXEC: btest-diff out
# #
@ -23,8 +20,6 @@
7 T 7 T
@TEST-END-FILE @TEST-END-FILE
@load frameworks/communication/listen
global outfile: file; global outfile: file;
redef InputAscii::empty_field = "EMPTY"; redef InputAscii::empty_field = "EMPTY";

7
testing/btest/scripts/base/frameworks/input/predicate.bro
View file

@ -1,7 +1,4 @@
# (uses listen.bro just to ensure input sources are more reliably fully-read). # @TEST-EXEC: btest-bg-run bro bro -b --pseudo-realtime -r $TRACES/socks.trace %INPUT
# @TEST-SERIALIZE: comm
#
# @TEST-EXEC: btest-bg-run bro bro -b %INPUT
# @TEST-EXEC: btest-bg-wait -k 5 # @TEST-EXEC: btest-bg-wait -k 5
# @TEST-EXEC: btest-diff out # @TEST-EXEC: btest-diff out
@ -19,8 +16,6 @@
7 T 7 T
@TEST-END-FILE @TEST-END-FILE
@load frameworks/communication/listen
global outfile: file; global outfile: file;
redef InputAscii::empty_field = "EMPTY"; redef InputAscii::empty_field = "EMPTY";

7
testing/btest/scripts/base/frameworks/input/predicatemodify.bro
View file

@ -1,7 +1,4 @@
# (uses listen.bro just to ensure input sources are more reliably fully-read). # @TEST-EXEC: btest-bg-run bro bro -b --pseudo-realtime -r $TRACES/socks.trace %INPUT
# @TEST-SERIALIZE: comm
#
# @TEST-EXEC: btest-bg-run bro bro -b %INPUT
# @TEST-EXEC: btest-bg-wait -k 5 # @TEST-EXEC: btest-bg-wait -k 5
# @TEST-EXEC: btest-diff out # @TEST-EXEC: btest-diff out
@ -14,8 +11,6 @@
2 T test2 idx2 2 T test2 idx2
@TEST-END-FILE @TEST-END-FILE
@load frameworks/communication/listen
global outfile: file; global outfile: file;
redef InputAscii::empty_field = "EMPTY"; redef InputAscii::empty_field = "EMPTY";

7
testing/btest/scripts/base/frameworks/input/predicatemodifyandreread.bro
View file

@ -1,8 +1,5 @@
# (uses listen.bro just to ensure input sources are more reliably fully-read).
# @TEST-SERIALIZE: comm
#
# @TEST-EXEC: cp input1.log input.log # @TEST-EXEC: cp input1.log input.log
# @TEST-EXEC: btest-bg-run bro bro -b %INPUT # @TEST-EXEC: btest-bg-run bro bro -b --pseudo-realtime -r $TRACES/socks.trace %INPUT
# @TEST-EXEC: sleep 2 # @TEST-EXEC: sleep 2
# @TEST-EXEC: cp input2.log input.log # @TEST-EXEC: cp input2.log input.log
# @TEST-EXEC: sleep 2 # @TEST-EXEC: sleep 2
@ -58,8 +55,6 @@
1 T test1 idx1 1 T test1 idx1
@TEST-END-FILE @TEST-END-FILE
@load frameworks/communication/listen
redef InputAscii::empty_field = "EMPTY"; redef InputAscii::empty_field = "EMPTY";
module A; module A;

7
testing/btest/scripts/base/frameworks/input/predicaterefusesecondsamerecord.bro
View file

@ -1,7 +1,4 @@
# (uses listen.bro just to ensure input sources are more reliably fully-read). # @TEST-EXEC: btest-bg-run bro bro -b --pseudo-realtime -r $TRACES/socks.trace %INPUT
# @TEST-SERIALIZE: comm
#
# @TEST-EXEC: btest-bg-run bro bro -b %INPUT
# @TEST-EXEC: btest-bg-wait -k 5 # @TEST-EXEC: btest-bg-wait -k 5
# @TEST-EXEC: btest-diff out # @TEST-EXEC: btest-diff out
@ -17,8 +14,6 @@ need-to-know 8c864306-d21a-37b1-8705-746a786719bf medium 95 1342569600 1.228.83.
need-to-know 8c864306-d21a-37b1-8705-746a786719bf medium 65 1342656000 1.228.83.33 - - 9318 HANARO-AS Hanaro Telecom Inc. 1.224.0.0/13 apnic KR spam infrastructure spamming;malware domain public http://reputation.alienvault.com/reputation.generic need-to-know 8c864306-d21a-37b1-8705-746a786719bf medium 65 1342656000 1.228.83.33 - - 9318 HANARO-AS Hanaro Telecom Inc. 1.224.0.0/13 apnic KR spam infrastructure spamming;malware domain public http://reputation.alienvault.com/reputation.generic
@TEST-END-FILE @TEST-END-FILE
@load frameworks/communication/listen
global outfile: file; global outfile: file;
redef InputAscii::empty_field = "EMPTY"; redef InputAscii::empty_field = "EMPTY";

7
testing/btest/scripts/base/frameworks/input/raw.bro
View file

@ -1,7 +1,4 @@
# (uses listen.bro just to ensure input sources are more reliably fully-read). # @TEST-EXEC: btest-bg-run bro bro -b --pseudo-realtime -r $TRACES/socks.trace %INPUT
# @TEST-SERIALIZE: comm
#
# @TEST-EXEC: btest-bg-run bro bro -b %INPUT
# @TEST-EXEC: btest-bg-wait -k 5 # @TEST-EXEC: btest-bg-wait -k 5
# @TEST-EXEC: btest-diff out # @TEST-EXEC: btest-diff out
@ -16,8 +13,6 @@ sdf
3rw43wRRERLlL#RWERERERE. 3rw43wRRERLlL#RWERERERE.
@TEST-END-FILE @TEST-END-FILE
@load frameworks/communication/listen
global outfile: file; global outfile: file;
global try: count; global try: count;

7
testing/btest/scripts/base/frameworks/input/repeat.bro
View file

@ -1,7 +1,4 @@
# (uses listen.bro just to ensure input sources are more reliably fully-read). # @TEST-EXEC: btest-bg-run bro bro -b --pseudo-realtime -r $TRACES/socks.trace %INPUT
# @TEST-SERIALIZE: comm
#
# @TEST-EXEC: btest-bg-run bro bro -b %INPUT
# @TEST-EXEC: btest-bg-wait -k 5 # @TEST-EXEC: btest-bg-wait -k 5
# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff out # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff out
@ -13,8 +10,6 @@
1 T 1 T
@TEST-END-FILE @TEST-END-FILE
@load frameworks/communication/listen
global outfile: file; global outfile: file;
global try: count; global try: count;

6
testing/btest/scripts/base/frameworks/input/reread.bro
View file

@ -1,8 +1,5 @@
# (uses listen.bro just to ensure input sources are more reliably fully-read).
# @TEST-SERIALIZE: comm
#
# @TEST-EXEC: cp input1.log input.log # @TEST-EXEC: cp input1.log input.log
# @TEST-EXEC: btest-bg-run bro bro -b %INPUT # @TEST-EXEC: btest-bg-run bro bro -b --pseudo-realtime -r $TRACES/socks.trace %INPUT
# @TEST-EXEC: sleep 2 # @TEST-EXEC: sleep 2
# @TEST-EXEC: cp input2.log input.log # @TEST-EXEC: cp input2.log input.log
# @TEST-EXEC: sleep 2 # @TEST-EXEC: sleep 2
@ -59,7 +56,6 @@ F -48 SSH::LOG 21 123 10.0.0.0/24 1.2.3.4 3.14 1315801931.273616 100.000000 hurz
@TEST-END-FILE @TEST-END-FILE
@load base/protocols/ssh @load base/protocols/ssh
@load frameworks/communication/listen
redef InputAscii::empty_field = "EMPTY"; redef InputAscii::empty_field = "EMPTY";

7
testing/btest/scripts/base/frameworks/input/rereadraw.bro
View file

@ -1,7 +1,4 @@
# (uses listen.bro just to ensure input sources are more reliably fully-read). # @TEST-EXEC: btest-bg-run bro bro -b --pseudo-realtime -r $TRACES/socks.trace %INPUT
# @TEST-SERIALIZE: comm
#
# @TEST-EXEC: btest-bg-run bro bro -b %INPUT
# @TEST-EXEC: btest-bg-wait -k 5 # @TEST-EXEC: btest-bg-wait -k 5
# @TEST-EXEC: btest-diff out # @TEST-EXEC: btest-diff out
@ -16,8 +13,6 @@ sdf
3rw43wRRERLlL#RWERERERE. 3rw43wRRERLlL#RWERERERE.
@TEST-END-FILE @TEST-END-FILE
@load frameworks/communication/listen
global outfile: file; global outfile: file;
global try: count; global try: count;

7
testing/btest/scripts/base/frameworks/input/set.bro
View file

@ -1,7 +1,4 @@
# (uses listen.bro just to ensure input sources are more reliably fully-read). # @TEST-EXEC: btest-bg-run bro bro -b --pseudo-realtime -r $TRACES/socks.trace %INPUT
# @TEST-SERIALIZE: comm
#
# @TEST-EXEC: btest-bg-run bro bro -b %INPUT
# @TEST-EXEC: btest-bg-wait -k 5 # @TEST-EXEC: btest-bg-wait -k 5
# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff out # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff out
@ -16,8 +13,6 @@
192.168.17.42 192.168.17.42
@TEST-END-FILE @TEST-END-FILE
@load frameworks/communication/listen
global outfile: file; global outfile: file;
redef InputAscii::empty_field = "EMPTY"; redef InputAscii::empty_field = "EMPTY";

7
testing/btest/scripts/base/frameworks/input/setseparator.bro
View file

@ -1,7 +1,4 @@
# (uses listen.bro just to ensure input sources are more reliably fully-read). # @TEST-EXEC: btest-bg-run bro bro -b --pseudo-realtime -r $TRACES/socks.trace %INPUT
# @TEST-SERIALIZE: comm
#
# @TEST-EXEC: btest-bg-run bro bro -b %INPUT
# @TEST-EXEC: btest-bg-wait -k 5 # @TEST-EXEC: btest-bg-wait -k 5
# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff out # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff out
@ -13,8 +10,6 @@
redef InputAscii::set_separator = "|"; redef InputAscii::set_separator = "|";
@load frameworks/communication/listen
global outfile: file; global outfile: file;
module A; module A;

8
testing/btest/scripts/base/frameworks/input/setspecialcases.bro
View file

@ -1,7 +1,4 @@
# (uses listen.bro just to ensure input sources are more reliably fully-read). # @TEST-EXEC: btest-bg-run bro bro -b --pseudo-realtime -r $TRACES/socks.trace %INPUT
# @TEST-SERIALIZE: comm
#
# @TEST-EXEC: btest-bg-run bro bro -b %INPUT
# @TEST-EXEC: btest-bg-wait -k 5 # @TEST-EXEC: btest-bg-wait -k 5
# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff out # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff out
@ -16,9 +13,6 @@
6 6
@TEST-END-FILE @TEST-END-FILE
@load frameworks/communication/listen
global outfile: file; global outfile: file;
module A; module A;

6
testing/btest/scripts/base/frameworks/input/stream.bro
View file

@ -1,8 +1,5 @@
# (uses listen.bro just to ensure input sources are more reliably fully-read).
# @TEST-SERIALIZE: comm
#
# @TEST-EXEC: cp input1.log input.log # @TEST-EXEC: cp input1.log input.log
# @TEST-EXEC: btest-bg-run bro bro -b %INPUT # @TEST-EXEC: btest-bg-run bro bro -b --pseudo-realtime -r $TRACES/socks.trace %INPUT
# @TEST-EXEC: sleep 3 # @TEST-EXEC: sleep 3
# @TEST-EXEC: cat input2.log >> input.log # @TEST-EXEC: cat input2.log >> input.log
# @TEST-EXEC: sleep 3 # @TEST-EXEC: sleep 3
@ -25,7 +22,6 @@ F -43 SSH::LOG 21 123 10.0.0.0/24 1.2.3.4 3.14 1315801931.273616 100.000000 hurz
@TEST-END-FILE @TEST-END-FILE
@load base/protocols/ssh @load base/protocols/ssh
@load frameworks/communication/listen
redef InputAscii::empty_field = "EMPTY"; redef InputAscii::empty_field = "EMPTY";

7
testing/btest/scripts/base/frameworks/input/streamraw.bro
View file

@ -1,8 +1,5 @@
# (uses listen.bro just to ensure input sources are more reliably fully-read).
# @TEST-SERIALIZE: comm
#
# @TEST-EXEC: cp input1.log input.log # @TEST-EXEC: cp input1.log input.log
# @TEST-EXEC: btest-bg-run bro bro -b %INPUT # @TEST-EXEC: btest-bg-run bro bro -b --pseudo-realtime -r $TRACES/socks.trace %INPUT
# @TEST-EXEC: sleep 3 # @TEST-EXEC: sleep 3
# @TEST-EXEC: cat input2.log >> input.log # @TEST-EXEC: cat input2.log >> input.log
# @TEST-EXEC: sleep 3 # @TEST-EXEC: sleep 3
@ -27,8 +24,6 @@ sdf
3rw43wRRERLlL#RWERERERE. 3rw43wRRERLlL#RWERERERE.
@TEST-END-FILE @TEST-END-FILE
@load frameworks/communication/listen
module A; module A;
type Val: record { type Val: record {

6
testing/btest/scripts/base/frameworks/input/subrecord-event.bro
View file

@ -1,7 +1,4 @@
# (uses listen.bro just to ensure input sources are more reliably fully-read). # @TEST-EXEC: btest-bg-run bro bro -b --pseudo-realtime -r $TRACES/socks.trace %INPUT
# @TEST-SERIALIZE: comm
#
# @TEST-EXEC: btest-bg-run bro bro -b %INPUT
# @TEST-EXEC: btest-bg-wait -k 5 # @TEST-EXEC: btest-bg-wait -k 5
# @TEST-EXEC: btest-diff out # @TEST-EXEC: btest-diff out
@ -14,7 +11,6 @@ T -42 SSH::LOG 21 123 10.0.0.0/24 1.2.3.4 3.14 1315801931.273616 100.000000 hurz
@TEST-END-FILE @TEST-END-FILE
@load base/protocols/ssh @load base/protocols/ssh
@load frameworks/communication/listen
global outfile: file; global outfile: file;
global try: count; global try: count;

6
testing/btest/scripts/base/frameworks/input/subrecord.bro
View file

@ -1,7 +1,4 @@
# (uses listen.bro just to ensure input sources are more reliably fully-read). # @TEST-EXEC: btest-bg-run bro bro -b --pseudo-realtime -r $TRACES/socks.trace %INPUT
# @TEST-SERIALIZE: comm
#
# @TEST-EXEC: btest-bg-run bro bro -b %INPUT
# @TEST-EXEC: btest-bg-wait -k 5 # @TEST-EXEC: btest-bg-wait -k 5
# @TEST-EXEC: btest-diff out # @TEST-EXEC: btest-diff out
@ -14,7 +11,6 @@ T -42 SSH::LOG 21 123 10.0.0.0/24 1.2.3.4 3.14 1315801931.273616 100.000000 hurz
@TEST-END-FILE @TEST-END-FILE
@load base/protocols/ssh @load base/protocols/ssh
@load frameworks/communication/listen
global outfile: file; global outfile: file;

7
testing/btest/scripts/base/frameworks/input/tableevent.bro
View file

@ -1,7 +1,4 @@
# (uses listen.bro just to ensure input sources are more reliably fully-read). # @TEST-EXEC: btest-bg-run bro bro -b --pseudo-realtime -r $TRACES/socks.trace %INPUT
# @TEST-SERIALIZE: comm
#
# @TEST-EXEC: btest-bg-run bro bro -b %INPUT
# @TEST-EXEC: btest-bg-wait -k 5 # @TEST-EXEC: btest-bg-wait -k 5
# @TEST-EXEC: btest-diff out # @TEST-EXEC: btest-diff out
@ -19,8 +16,6 @@
7 T 7 T
@TEST-END-FILE @TEST-END-FILE
@load frameworks/communication/listen
global outfile: file; global outfile: file;
global try: count; global try: count;

6
testing/btest/scripts/base/frameworks/input/twotables.bro
View file

@ -1,8 +1,5 @@
# (uses listen.bro just to ensure input sources are more reliably fully-read).
# @TEST-SERIALIZE: comm
#
# @TEST-EXEC: cp input1.log input.log # @TEST-EXEC: cp input1.log input.log
# @TEST-EXEC: btest-bg-run bro bro -b %INPUT # @TEST-EXEC: btest-bg-run bro bro -b --pseudo-realtime -r $TRACES/socks.trace %INPUT
# @TEST-EXEC: sleep 5 # @TEST-EXEC: sleep 5
# @TEST-EXEC: cp input3.log input.log # @TEST-EXEC: cp input3.log input.log
# @TEST-EXEC: btest-bg-wait -k 10 # @TEST-EXEC: btest-bg-wait -k 10
@ -34,7 +31,6 @@ F -44 SSH::LOG 21 123 10.0.0.0/24 1.2.3.4 3.14 1315801931.273616 100.000000 hurz
@TEST-END-FILE @TEST-END-FILE
@load base/protocols/ssh @load base/protocols/ssh
@load frameworks/communication/listen
redef InputAscii::empty_field = "EMPTY"; redef InputAscii::empty_field = "EMPTY";

6
testing/btest/scripts/base/frameworks/input/unsupported_types.bro
View file

@ -1,7 +1,4 @@
# (uses listen.bro just to ensure input sources are more reliably fully-read). # @TEST-EXEC: btest-bg-run bro bro -b --pseudo-realtime -r $TRACES/socks.trace %INPUT
# @TEST-SERIALIZE: comm
#
# @TEST-EXEC: btest-bg-run bro bro -b %INPUT
# @TEST-EXEC: btest-bg-wait -k 5 # @TEST-EXEC: btest-bg-wait -k 5
# @TEST-EXEC: btest-diff out # @TEST-EXEC: btest-diff out
@ -14,7 +11,6 @@ whatever T -42 SSH::LOG 21 123 10.0.0.0/24 1.2.3.4 3.14 1315801931.273616 100.00
@TEST-END-FILE @TEST-END-FILE
@load base/protocols/ssh @load base/protocols/ssh
@load frameworks/communication/listen
global outfile: file; global outfile: file;