From 2dcc93678794fb4b6f09157c327c208c79a058e7 Mon Sep 17 00:00:00 2001 From: Tim Wojtulewicz Date: Tue, 26 Nov 2019 13:01:30 -0700 Subject: [PATCH] Test changes caused by minor order-of-operation changes related to the new loop architecture --- .../Baseline/language.expire_subnet/output | 4 ++-- testing/btest/Traces/snmp/leak_test.pcap | Bin 0 -> 11168 bytes .../frameworks/netcontrol/basic-cluster.zeek | 6 +++++- 3 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 testing/btest/Traces/snmp/leak_test.pcap diff --git a/testing/btest/Baseline/language.expire_subnet/output b/testing/btest/Baseline/language.expire_subnet/output index 9bb289af0c..5557d41190 100644 --- a/testing/btest/Baseline/language.expire_subnet/output +++ b/testing/btest/Baseline/language.expire_subnet/output @@ -15,11 +15,11 @@ Accessed table nums: two; three Accessed table nets: two; zero, three Time: 7.0 secs 518.0 msecs 828.15361 usecs +Expired Subnet: 192.168.4.0/24 --> four at 8.0 secs 835.0 msecs 30.078888 usecs +Expired Subnet: 192.168.1.0/24 --> one at 8.0 secs 835.0 msecs 30.078888 usecs Expired Num: 4 --> four at 8.0 secs 835.0 msecs 30.078888 usecs Expired Num: 1 --> one at 8.0 secs 835.0 msecs 30.078888 usecs Expired Num: 0 --> zero at 8.0 secs 835.0 msecs 30.078888 usecs -Expired Subnet: 192.168.4.0/24 --> four at 8.0 secs 835.0 msecs 30.078888 usecs -Expired Subnet: 192.168.1.0/24 --> one at 8.0 secs 835.0 msecs 30.078888 usecs Expired Subnet: 192.168.0.0/16 --> zero at 15.0 secs 150.0 msecs 681.018829 usecs Expired Subnet: 192.168.3.0/24 --> three at 15.0 secs 150.0 msecs 681.018829 usecs Expired Subnet: 192.168.2.0/24 --> two at 15.0 secs 150.0 msecs 681.018829 usecs diff --git a/testing/btest/Traces/snmp/leak_test.pcap b/testing/btest/Traces/snmp/leak_test.pcap new file mode 100644 index 0000000000000000000000000000000000000000..0abdc0a6a4ba3d0dbb6fcd67c0fc1d86b98eddb4 GIT binary patch literal 11168 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 literal 0 HcmV?d00001 diff --git a/testing/btest/scripts/base/frameworks/netcontrol/basic-cluster.zeek b/testing/btest/scripts/base/frameworks/netcontrol/basic-cluster.zeek index 2ff506b39f..b3aa5344f2 100644 --- a/testing/btest/scripts/base/frameworks/netcontrol/basic-cluster.zeek +++ b/testing/btest/scripts/base/frameworks/netcontrol/basic-cluster.zeek @@ -21,7 +21,7 @@ redef Cluster::nodes = { @TEST-END-FILE redef Log::default_rotation_interval = 0secs; -#redef exit_only_after_terminate = T; +redef exit_only_after_terminate = T; @load base/frameworks/netcontrol @@ -75,5 +75,9 @@ event NetControl::rule_added(r: NetControl::Rule, p: NetControl::PluginState, ms event NetControl::rule_destroyed(r: NetControl::Rule) { if ( r$entity?$ip ) + { print "Rule destroyed", r$id, r$cid, |NetControl::find_rules_subnet(r$entity$ip)|; + if ( Cluster::local_node_type() == Cluster::WORKER ) + schedule 2sec { terminate_me() }; + } }