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

Update unit test output to match json.zeek being deprecated and slight format changes to JSON output

Browse source
This commit is contained in:
Tim Wojtulewicz 2019-06-26 14:58:53 -07:00
parent 33a7927704
commit d27c846ec5
7 changed files with 31 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

1
testing/btest/Baseline/coverage.bare-mode-errors/errors
View file

@ -0,0 +1 @@
warning in /Users/tim/Desktop/projects/zeek/testing/btest/../../scripts//base/utils/json.zeek, line 2: deprecated script loaded from command line arguments ="Remove in 3.1. to_json is now always available as a built-in function."

1
testing/btest/Baseline/coverage.default-load-baseline/canonified_loaded_scripts.log
View file

@ -249,7 +249,6 @@ scripts/base/init-default.zeek
scripts/base/frameworks/openflow/main.zeek scripts/base/frameworks/openflow/main.zeek
scripts/base/frameworks/openflow/plugins/__load__.zeek scripts/base/frameworks/openflow/plugins/__load__.zeek
scripts/base/frameworks/openflow/plugins/ryu.zeek scripts/base/frameworks/openflow/plugins/ryu.zeek
scripts/base/utils/json.zeek
scripts/base/frameworks/openflow/plugins/log.zeek scripts/base/frameworks/openflow/plugins/log.zeek
scripts/base/frameworks/openflow/plugins/broker.zeek scripts/base/frameworks/openflow/plugins/broker.zeek
scripts/base/frameworks/openflow/non-cluster.zeek scripts/base/frameworks/openflow/non-cluster.zeek

1
testing/btest/Baseline/coverage.init-default/missing_loads
View file

@ -8,3 +8,4 @@
-./frameworks/openflow/cluster.zeek -./frameworks/openflow/cluster.zeek
-./frameworks/packet-filter/cluster.zeek -./frameworks/packet-filter/cluster.zeek
-./frameworks/sumstats/cluster.zeek -./frameworks/sumstats/cluster.zeek
-./utils/json.zeek

3
testing/btest/Baseline/plugins.hooks/output
View file

@ -821,7 +821,6 @@
0.000000 MetaHookPost LoadFile(0, base<...>/input.bif.zeek) -> -1 0.000000 MetaHookPost LoadFile(0, base<...>/input.bif.zeek) -> -1
0.000000 MetaHookPost LoadFile(0, base<...>/intel) -> -1 0.000000 MetaHookPost LoadFile(0, base<...>/intel) -> -1
0.000000 MetaHookPost LoadFile(0, base<...>/irc) -> -1 0.000000 MetaHookPost LoadFile(0, base<...>/irc) -> -1
0.000000 MetaHookPost LoadFile(0, base<...>/json.zeek) -> -1
0.000000 MetaHookPost LoadFile(0, base<...>/krb) -> -1 0.000000 MetaHookPost LoadFile(0, base<...>/krb) -> -1
0.000000 MetaHookPost LoadFile(0, base<...>/logging) -> -1 0.000000 MetaHookPost LoadFile(0, base<...>/logging) -> -1
0.000000 MetaHookPost LoadFile(0, base<...>/logging.bif.zeek) -> -1 0.000000 MetaHookPost LoadFile(0, base<...>/logging.bif.zeek) -> -1
@ -1712,7 +1711,6 @@
0.000000 MetaHookPre LoadFile(0, base<...>/input.bif.zeek) 0.000000 MetaHookPre LoadFile(0, base<...>/input.bif.zeek)
0.000000 MetaHookPre LoadFile(0, base<...>/intel) 0.000000 MetaHookPre LoadFile(0, base<...>/intel)
0.000000 MetaHookPre LoadFile(0, base<...>/irc) 0.000000 MetaHookPre LoadFile(0, base<...>/irc)
0.000000 MetaHookPre LoadFile(0, base<...>/json.zeek)
0.000000 MetaHookPre LoadFile(0, base<...>/krb) 0.000000 MetaHookPre LoadFile(0, base<...>/krb)
0.000000 MetaHookPre LoadFile(0, base<...>/logging) 0.000000 MetaHookPre LoadFile(0, base<...>/logging)
0.000000 MetaHookPre LoadFile(0, base<...>/logging.bif.zeek) 0.000000 MetaHookPre LoadFile(0, base<...>/logging.bif.zeek)
@ -2611,7 +2609,6 @@
0.000000 | HookLoadFile base<...>/input.bif.zeek 0.000000 | HookLoadFile base<...>/input.bif.zeek
0.000000 | HookLoadFile base<...>/intel 0.000000 | HookLoadFile base<...>/intel
0.000000 | HookLoadFile base<...>/irc 0.000000 | HookLoadFile base<...>/irc
0.000000 | HookLoadFile base<...>/json.zeek
0.000000 | HookLoadFile base<...>/krb 0.000000 | HookLoadFile base<...>/krb
0.000000 | HookLoadFile base<...>/logging 0.000000 | HookLoadFile base<...>/logging
0.000000 | HookLoadFile base<...>/logging.bif.zeek 0.000000 | HookLoadFile base<...>/logging.bif.zeek

9
testing/btest/Baseline/scripts.base.utils.json/output
View file

@ -8,16 +8,17 @@ true
"-12.0 hrs" "-12.0 hrs"
"hello" "hello"
"" ""
65535 {"port":65535,"proto":"tcp"}
1 {"port":1,"proto":"udp"}
123 {"port":123,"proto":"icmp"}
0 {"port":0,"proto":"unknown"}
"1.2.3.4" "1.2.3.4"
"ffff:1234::1" "ffff:1234::1"
"123.123.123.123" "123.123.123.123"
"192.0.0.0/8" "192.0.0.0/8"
"fe80::/64" "fe80::/64"
"Red" "Red"
"/^?(^abcd)$?/"
{"s":"test","c":100} {"s":"test","c":100}
{"s":"test"} {"s":"test"}
{"s":"test"} {"s":"test"}

3
testing/btest/scripts/base/utils/json.test
View file

@ -72,6 +72,9 @@ event zeek_init()
local e: color = Red; local e: color = Red;
print to_json(e); print to_json(e);
local p: pattern = /^abcd/;
print to_json(p);
# ######################### # #########################
# Test the container types: # Test the container types: