diff --git a/testing/btest/Baseline/scripts.base.frameworks.config.read_config_cluster/manager-1.config.log b/testing/btest/Baseline/scripts.base.frameworks.config.read_config_cluster/manager-1.config.log index a9794564b3..f1420279b4 100644 --- a/testing/btest/Baseline/scripts.base.frameworks.config.read_config_cluster/manager-1.config.log +++ b/testing/btest/Baseline/scripts.base.frameworks.config.read_config_cluster/manager-1.config.log @@ -3,21 +3,22 @@ #empty_field (empty) #unset_field - #path config -#open 2018-06-29-20-24-53 +#open 2018-07-20-20-40-10 #fields ts id old_value new_value location #types time string string string string -1530303893.918762 testbool T F ../configfile -1530303893.918762 testcount 0 1 ../configfile -1530303893.918762 testcount 1 2 ../configfile -1530303893.918762 testint 0 -1 ../configfile -1530303893.918762 testenum SSH::LOG Conn::LOG ../configfile -1530303893.918762 testport 42/tcp 45/unknown ../configfile -1530303893.918762 testaddr 127.0.0.1 127.0.0.1 ../configfile -1530303893.918762 testaddr 127.0.0.1 2607:f8b0:4005:801::200e ../configfile -1530303893.918762 testinterval 1.0 sec 60.0 ../configfile -1530303893.918762 testtime 0.0 1507321987.0 ../configfile -1530303893.918762 test_set (empty) b,c,a,d,erdbeerschnitzel ../configfile -1530303893.918762 test_set b,c,a,d,erdbeerschnitzel \x28empty) ../configfile -1530303893.918762 test_set \x28empty) \x2d ../configfile -1530303893.918762 test_set_full 2,1,7,15,10,3 6,4,1,7,5,3 ../configfile -#close 2018-06-29-20-25-06 +1532119210.151927 testbool T F ../configfile +1532119210.151927 testcount 0 1 ../configfile +1532119210.151927 testcount 1 2 ../configfile +1532119210.151927 testint 0 -1 ../configfile +1532119210.151927 testenum SSH::LOG Conn::LOG ../configfile +1532119210.151927 testport 42/tcp 45/unknown ../configfile +1532119210.151927 testaddr 127.0.0.1 127.0.0.1 ../configfile +1532119210.151927 testaddr 127.0.0.1 2607:f8b0:4005:801::200e ../configfile +1532119210.151927 testinterval 1.0 sec 60.0 ../configfile +1532119210.151927 testtime 0.0 1507321987.0 ../configfile +1532119210.151927 test_set (empty) b,c,a,d,erdbeerschnitzel ../configfile +1532119210.151927 test_vector (empty) 1,2,3,4,5,6 ../configfile +1532119210.151927 test_set b,c,a,d,erdbeerschnitzel \x28empty) ../configfile +1532119210.151927 test_set \x28empty) \x2d ../configfile +1532119210.151927 test_set_full 2,1,7,15,10,3 6,4,1,7,5,3 ../configfile +#close 2018-07-20-20-40-22 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 b55e8dd13c..08b60346e3 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,6 +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, 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 b55e8dd13c..08b60346e3 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,6 +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, 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/scripts/base/frameworks/config/read_config_cluster.bro b/testing/btest/scripts/base/frameworks/config/read_config_cluster.bro index d44518579f..4d35b794bc 100644 --- a/testing/btest/scripts/base/frameworks/config/read_config_cluster.bro +++ b/testing/btest/scripts/base/frameworks/config/read_config_cluster.bro @@ -52,7 +52,7 @@ export { option teststring = "a"; option test_set: set[string] = {}; option test_set_full: set[count] = {1, 2, 3, 7, 10, 15}; - #option test_vector: vector of count = {}; + option test_vector: vector of count = {}; } event bro_init()