From 2bb36a7d107984d2c53b3138b1b38dfa075b225c Mon Sep 17 00:00:00 2001 From: Jon Siwek Date: Mon, 20 Jun 2011 13:55:44 -0500 Subject: [PATCH] Fix language.rare-events test to use new policy scripts. DroppedPackets now goes in notice.log by default so that log is the new baseline. --- testing/btest/Baseline/language.rare-events/notice.log | 2 ++ testing/btest/Baseline/language.rare-events/output | 1 - testing/btest/language/rare-events.bro | 6 +++--- 3 files changed, 5 insertions(+), 4 deletions(-) create mode 100644 testing/btest/Baseline/language.rare-events/notice.log delete mode 100644 testing/btest/Baseline/language.rare-events/output diff --git a/testing/btest/Baseline/language.rare-events/notice.log b/testing/btest/Baseline/language.rare-events/notice.log new file mode 100644 index 0000000000..c0b6154ac2 --- /dev/null +++ b/testing/btest/Baseline/language.rare-events/notice.log @@ -0,0 +1,2 @@ +# ts uid id.orig_h id.orig_p id.resp_h id.resp_p victim note msg sub src dst p n action tag do_alarm +1308596064.17872 - - - - - - PacketFilter::DroppedPackets 2 packets dropped after filtering, 1109 received, 10000 on link - - - - - Notice::ACTION_FILE @UWkUyAuUGXf F diff --git a/testing/btest/Baseline/language.rare-events/output b/testing/btest/Baseline/language.rare-events/output deleted file mode 100644 index 1de3641284..0000000000 --- a/testing/btest/Baseline/language.rare-events/output +++ /dev/null @@ -1 +0,0 @@ -1106953531.452525 DroppedPackets 2 packets dropped after filtering, 1109 received, 10000 on link diff --git a/testing/btest/language/rare-events.bro b/testing/btest/language/rare-events.bro index ae7674d406..8dc56e26a0 100644 --- a/testing/btest/language/rare-events.bro +++ b/testing/btest/language/rare-events.bro @@ -1,5 +1,5 @@ -# @TEST-EXEC: bro %INPUT >output 2>&1 -# @TEST-EXEC: btest-diff output +# @TEST-EXEC: bro %INPUT +# @TEST-EXEC: btest-diff notice.log # This is a test script whose job is to generate rarely-seen events # (i.e., events that test traces might not include) to ensure that they're @@ -9,7 +9,7 @@ # Drop::restore_dropped_address is never defined. redef check_for_unused_event_handlers = F; -@load netstats +@load packet-filter/netstats function test_net_stats_update() {