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

Update broker unit test output.

Browse source 
Due to string representation of Broker vectors changing (they now
use parentheses instead of square brackets).

Related to https://github.com/zeek/broker/issues/43
This commit is contained in:
Jon Siwek 2019-05-23 18:03:42 -07:00
parent 30db17464d
commit ce17ae8ea2
9 changed files with 21 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

7
CHANGES
View file

@ -1,4 +1,11 @@
2.6-331 | 2019-05-23 18:03:42 -0700
* Update broker unit test output. (Jon Siwek, Corelight)
Due to string representation of Broker vectors changing (they now
use parentheses instead of square brackets).
2.6-330 | 2019-05-23 13:04:26 -0700 2.6-330 | 2019-05-23 13:04:26 -0700
* GH-173: Support ranges of values for value_list elements in the signature parser * GH-173: Support ranges of values for value_list elements in the signature parser

2
VERSION
View file

@ -1 +1 @@
2.6-330 2.6-331

2
aux/broker

@ -1 +1 @@
Subproject commit 0c7a8816fd385af4f633cb7239e3c63e6c88c27e Subproject commit 474a6d902b1c41912b216c06a74085ff3b102bad

4
testing/btest/Baseline/broker.store.ops/master.out
View file

@ -6,7 +6,7 @@
[6], { [6], {
y, y,
x x
}, Broker::SUCCESS, [data=broker::data{[1/tcp, 2/tcp, 3/tcp]}] }, Broker::SUCCESS, [data=broker::data{(1/tcp, 2/tcp, 3/tcp)}]
[7], two, Broker::SUCCESS, [data=broker::data{230}] [7], two, Broker::SUCCESS, [data=broker::data{230}]
[8], three, Broker::SUCCESS, [data=broker::data{320}] [8], three, Broker::SUCCESS, [data=broker::data{320}]
[9], four, Broker::SUCCESS, [data=broker::data{{1, 2, 3}}] [9], four, Broker::SUCCESS, [data=broker::data{{1, 2, 3}}]
@ -14,7 +14,7 @@ keys, [status=Broker::SUCCESS, result=[data=broker::data{{four, one, set, str, t
[11], str, Broker::SUCCESS, [data=broker::data{foobar}] [11], str, Broker::SUCCESS, [data=broker::data{foobar}]
[12], set, Broker::SUCCESS, [data=broker::data{{A, B, C}}] [12], set, Broker::SUCCESS, [data=broker::data{{A, B, C}}]
[13], table, Broker::SUCCESS, [data=broker::data{{a -> 1, c -> 3}}] [13], table, Broker::SUCCESS, [data=broker::data{{a -> 1, c -> 3}}]
[14], vec, Broker::SUCCESS, [data=broker::data{[1, 2, 3, 4]}] [14], vec, Broker::SUCCESS, [data=broker::data{(1, 2, 3, 4)}]
[15], one, [status=Broker::SUCCESS, result=[data=broker::data{T}]] [15], one, [status=Broker::SUCCESS, result=[data=broker::data{T}]]
[16], NOPE, [status=Broker::SUCCESS, result=[data=broker::data{F}]] [16], NOPE, [status=Broker::SUCCESS, result=[data=broker::data{F}]]
[17], vec, Broker::SUCCESS, [data=broker::data{2}] [17], vec, Broker::SUCCESS, [data=broker::data{2}]

4
testing/btest/Baseline/broker.store.record/master.out
View file

@ -2,7 +2,7 @@
T T
T T
T T
[data=broker::data{[hi, hello, 37]}], [s1=hi, s2=hello, c=37] [data=broker::data{(hi, hello, 37)}], [s1=hi, s2=hello, c=37]
[data=broker::data{hi}] [data=broker::data{hi}]
[data=broker::data{hello}] [data=broker::data{hello}]
@ -11,7 +11,7 @@ T
T T
3 3
[data=broker::data{goodbye}] [data=broker::data{goodbye}]
[data=broker::data{[hi, goodbye, 37]}], [s1=hi, s2=goodbye, c=37] [data=broker::data{(hi, goodbye, 37)}], [s1=hi, s2=goodbye, c=37]
| [data=broker::data{hi}] | [data=broker::data{hi}]
| [data=broker::data{goodbye}] | [data=broker::data{goodbye}]

2
testing/btest/Baseline/broker.store.sqlite/out
View file

@ -10,4 +10,4 @@ five, Broker::FAILURE, [data=<uninitialized>]
{ {
y, y,
x x
}, Broker::SUCCESS, [data=broker::data{[1/tcp, 2/tcp, 3/tcp]}] }, Broker::SUCCESS, [data=broker::data{(1/tcp, 2/tcp, 3/tcp)}]

10
testing/btest/Baseline/broker.store.vector/master.out
View file

@ -4,24 +4,24 @@ T
T T
T T
4 4
[data=broker::data{[hi, salutations, hello, greetings]}], [hi, salutations, hello, greetings] [data=broker::data{(hi, salutations, hello, greetings)}], [hi, salutations, hello, greetings]
| [data=broker::data{hi}] | [data=broker::data{hi}]
| [data=broker::data{salutations}] | [data=broker::data{salutations}]
| [data=broker::data{hello}] | [data=broker::data{hello}]
| [data=broker::data{greetings}] | [data=broker::data{greetings}]
[data=broker::data{hello}] [data=broker::data{hello}]
[data=broker::data{[hi, salutations, bah, greetings]}], [hi, salutations, bah, greetings] [data=broker::data{(hi, salutations, bah, greetings)}], [hi, salutations, bah, greetings]
[data=broker::data{bah}] [data=broker::data{bah}]
[data=broker::data{hi}] [data=broker::data{hi}]
[data=broker::data{[hi, salutations, bah, greetings]}], [hi, salutations, bah, greetings] [data=broker::data{(hi, salutations, bah, greetings)}], [hi, salutations, bah, greetings]
[data=broker::data{bah}] [data=broker::data{bah}]
[data=broker::data{[hi, salutations, greetings]}], [hi, salutations, greetings] [data=broker::data{(hi, salutations, greetings)}], [hi, salutations, greetings]
3 3
T T
0 0
[data=broker::data{[]}], [] [data=broker::data{()}], []

2
testing/btest/Baseline/scripts.base.frameworks.config.read_config_cluster/worker-1..stdout
View file

@ -6,7 +6,7 @@ cluster_set_option, testinterval, [data=broker::data{60000000000ns}], ../configf
cluster_set_option, test_set, [data=broker::data{{-}}], ../configfile cluster_set_option, test_set, [data=broker::data{{-}}], ../configfile
cluster_set_option, testaddr, [data=broker::data{2607:f8b0:4005:801::200e}], ../configfile cluster_set_option, testaddr, [data=broker::data{2607:f8b0:4005:801::200e}], ../configfile
cluster_set_option, testenum, [data=broker::data{Conn::LOG}], ../configfile cluster_set_option, testenum, [data=broker::data{Conn::LOG}], ../configfile
cluster_set_option, test_vector, [data=broker::data{[1, 2, 3, 4, 5, 6]}], ../configfile cluster_set_option, test_vector, [data=broker::data{(1, 2, 3, 4, 5, 6)}], ../configfile
cluster_set_option, testbool, [data=broker::data{F}], ../configfile cluster_set_option, testbool, [data=broker::data{F}], ../configfile
cluster_set_option, testcount, [data=broker::data{2}], ../configfile cluster_set_option, testcount, [data=broker::data{2}], ../configfile
cluster_set_option, test_set_full, [data=broker::data{{1, 3, 4, 5, 6, 7}}], ../configfile cluster_set_option, test_set_full, [data=broker::data{{1, 3, 4, 5, 6, 7}}], ../configfile

2
testing/btest/Baseline/scripts.base.frameworks.config.read_config_cluster/worker-2..stdout
View file

@ -6,7 +6,7 @@ cluster_set_option, testinterval, [data=broker::data{60000000000ns}], ../configf
cluster_set_option, test_set, [data=broker::data{{-}}], ../configfile cluster_set_option, test_set, [data=broker::data{{-}}], ../configfile
cluster_set_option, testaddr, [data=broker::data{2607:f8b0:4005:801::200e}], ../configfile cluster_set_option, testaddr, [data=broker::data{2607:f8b0:4005:801::200e}], ../configfile
cluster_set_option, testenum, [data=broker::data{Conn::LOG}], ../configfile cluster_set_option, testenum, [data=broker::data{Conn::LOG}], ../configfile
cluster_set_option, test_vector, [data=broker::data{[1, 2, 3, 4, 5, 6]}], ../configfile cluster_set_option, test_vector, [data=broker::data{(1, 2, 3, 4, 5, 6)}], ../configfile
cluster_set_option, testbool, [data=broker::data{F}], ../configfile cluster_set_option, testbool, [data=broker::data{F}], ../configfile
cluster_set_option, testcount, [data=broker::data{2}], ../configfile cluster_set_option, testcount, [data=broker::data{2}], ../configfile
cluster_set_option, test_set_full, [data=broker::data{{1, 3, 4, 5, 6, 7}}], ../configfile cluster_set_option, test_set_full, [data=broker::data{{1, 3, 4, 5, 6, 7}}], ../configfile