diff --git a/CHANGES b/CHANGES index 7fa31fb6f6..e728a770b4 100644 --- a/CHANGES +++ b/CHANGES @@ -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 * GH-173: Support ranges of values for value_list elements in the signature parser diff --git a/VERSION b/VERSION index e1c2285811..cb46b976cd 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.6-330 +2.6-331 diff --git a/aux/broker b/aux/broker index 0c7a8816fd..474a6d902b 160000 --- a/aux/broker +++ b/aux/broker @@ -1 +1 @@ -Subproject commit 0c7a8816fd385af4f633cb7239e3c63e6c88c27e +Subproject commit 474a6d902b1c41912b216c06a74085ff3b102bad diff --git a/testing/btest/Baseline/broker.store.ops/master.out b/testing/btest/Baseline/broker.store.ops/master.out index afb7c84fb4..80546431b5 100644 --- a/testing/btest/Baseline/broker.store.ops/master.out +++ b/testing/btest/Baseline/broker.store.ops/master.out @@ -6,7 +6,7 @@ [6], { y, 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}] [8], three, Broker::SUCCESS, [data=broker::data{320}] [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}] [12], set, Broker::SUCCESS, [data=broker::data{{A, B, C}}] [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}]] [16], NOPE, [status=Broker::SUCCESS, result=[data=broker::data{F}]] [17], vec, Broker::SUCCESS, [data=broker::data{2}] diff --git a/testing/btest/Baseline/broker.store.record/master.out b/testing/btest/Baseline/broker.store.record/master.out index 9e82505b41..6af2d5b737 100644 --- a/testing/btest/Baseline/broker.store.record/master.out +++ b/testing/btest/Baseline/broker.store.record/master.out @@ -2,7 +2,7 @@ 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{hello}] @@ -11,7 +11,7 @@ T T 3 [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{goodbye}] diff --git a/testing/btest/Baseline/broker.store.sqlite/out b/testing/btest/Baseline/broker.store.sqlite/out index 621474aef2..00c805d3ba 100644 --- a/testing/btest/Baseline/broker.store.sqlite/out +++ b/testing/btest/Baseline/broker.store.sqlite/out @@ -10,4 +10,4 @@ five, Broker::FAILURE, [data=] { y, x -}, Broker::SUCCESS, [data=broker::data{[1/tcp, 2/tcp, 3/tcp]}] +}, Broker::SUCCESS, [data=broker::data{(1/tcp, 2/tcp, 3/tcp)}] diff --git a/testing/btest/Baseline/broker.store.vector/master.out b/testing/btest/Baseline/broker.store.vector/master.out index e442646af8..173941abf1 100644 --- a/testing/btest/Baseline/broker.store.vector/master.out +++ b/testing/btest/Baseline/broker.store.vector/master.out @@ -4,24 +4,24 @@ T T T 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{salutations}] | [data=broker::data{hello}] | [data=broker::data{greetings}] [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{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{[hi, salutations, greetings]}], [hi, salutations, greetings] +[data=broker::data{(hi, salutations, greetings)}], [hi, salutations, greetings] 3 T 0 -[data=broker::data{[]}], [] +[data=broker::data{()}], [] diff --git a/testing/btest/Baseline/scripts.base.frameworks.config.read_config_cluster/worker-1..stdout b/testing/btest/Baseline/scripts.base.frameworks.config.read_config_cluster/worker-1..stdout index 08b60346e3..9484b3d205 100644 --- a/testing/btest/Baseline/scripts.base.frameworks.config.read_config_cluster/worker-1..stdout +++ b/testing/btest/Baseline/scripts.base.frameworks.config.read_config_cluster/worker-1..stdout @@ -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, testaddr, [data=broker::data{2607:f8b0:4005:801::200e}], ../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, testcount, [data=broker::data{2}], ../configfile cluster_set_option, test_set_full, [data=broker::data{{1, 3, 4, 5, 6, 7}}], ../configfile diff --git a/testing/btest/Baseline/scripts.base.frameworks.config.read_config_cluster/worker-2..stdout b/testing/btest/Baseline/scripts.base.frameworks.config.read_config_cluster/worker-2..stdout index 08b60346e3..9484b3d205 100644 --- a/testing/btest/Baseline/scripts.base.frameworks.config.read_config_cluster/worker-2..stdout +++ b/testing/btest/Baseline/scripts.base.frameworks.config.read_config_cluster/worker-2..stdout @@ -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, testaddr, [data=broker::data{2607:f8b0:4005:801::200e}], ../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, testcount, [data=broker::data{2}], ../configfile cluster_set_option, test_set_full, [data=broker::data{{1, 3, 4, 5, 6, 7}}], ../configfile