From 629c9d37ec0287d8e69acfd1ba09f743fcab3855 Mon Sep 17 00:00:00 2001 From: Prince Sunny Date: Mon, 14 Oct 2019 08:17:15 -0700 Subject: [PATCH] [vstest]: Revert back to 2 sec, and check if we got more than expected number of syslogs (#1091) --- tests/test_crm.py | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/tests/test_crm.py b/tests/test_crm.py index a27282682c3f..5fe74d12a67a 100644 --- a/tests/test_crm.py +++ b/tests/test_crm.py @@ -60,7 +60,7 @@ def setReadOnlyAttr(dvs, obj, attr, val): def check_syslog(dvs, marker, err_log, expected_cnt): (exitcode, num) = dvs.runcmd(['sh', '-c', "awk \'/%s/,ENDFILE {print;}\' /var/log/syslog | grep \"%s\" | wc -l" % (marker, err_log)]) - assert num.strip() == str(expected_cnt) + assert num.strip() >= str(expected_cnt) class TestCrm(object): def test_CrmFdbEntry(self, dvs, testlog): @@ -120,10 +120,10 @@ def test_CrmFdbEntry(self, dvs, testlog): assert new_avail_counter == avail_counter marker = dvs.add_log_marker() - dvs.runcmd("crm config polling interval 3") + dvs.runcmd("crm config polling interval 2") dvs.runcmd("crm config thresholds fdb high 90") dvs.runcmd("crm config thresholds fdb type free") - time.sleep(3) + time.sleep(2) check_syslog(dvs, marker, "FDB_ENTRY THRESHOLD_EXCEEDED for TH_FREE", 1) # enable ipv6 on server 2 @@ -183,10 +183,10 @@ def test_CrmIpv4Route(self, dvs, testlog): assert new_avail_counter == avail_counter marker = dvs.add_log_marker() - dvs.runcmd("crm config polling interval 3") + dvs.runcmd("crm config polling interval 2") dvs.runcmd("crm config thresholds ipv4 route high 90") dvs.runcmd("crm config thresholds ipv4 route type free") - time.sleep(3) + time.sleep(2) check_syslog(dvs, marker, "IPV4_ROUTE THRESHOLD_EXCEEDED for TH_FREE",1) intf_tbl._del("Ethernet0|10.0.0.0/31") @@ -253,10 +253,10 @@ def test_CrmIpv6Route(self, dvs, testlog): assert new_avail_counter == avail_counter marker = dvs.add_log_marker() - dvs.runcmd("crm config polling interval 3") + dvs.runcmd("crm config polling interval 2") dvs.runcmd("crm config thresholds ipv6 route high 90") dvs.runcmd("crm config thresholds ipv6 route type free") - time.sleep(3) + time.sleep(2) check_syslog(dvs, marker, "IPV6_ROUTE THRESHOLD_EXCEEDED for TH_FREE",1) intf_tbl._del("Ethernet0|fc00::1/126") @@ -308,10 +308,10 @@ def test_CrmIpv4Nexthop(self, dvs, testlog): assert new_avail_counter == avail_counter marker = dvs.add_log_marker() - dvs.runcmd("crm config polling interval 3") + dvs.runcmd("crm config polling interval 2") dvs.runcmd("crm config thresholds ipv4 nexthop high 90") dvs.runcmd("crm config thresholds ipv4 nexthop type free") - time.sleep(3) + time.sleep(2) check_syslog(dvs, marker, "IPV4_NEXTHOP THRESHOLD_EXCEEDED for TH_FREE",1) intf_tbl._del("Ethernet0|10.0.0.0/31") @@ -367,10 +367,10 @@ def test_CrmIpv6Nexthop(self, dvs, testlog): assert new_avail_counter == avail_counter marker = dvs.add_log_marker() - dvs.runcmd("crm config polling interval 3") + dvs.runcmd("crm config polling interval 2") dvs.runcmd("crm config thresholds ipv6 nexthop high 90") dvs.runcmd("crm config thresholds ipv6 nexthop type free") - time.sleep(3) + time.sleep(2) check_syslog(dvs, marker, "IPV6_NEXTHOP THRESHOLD_EXCEEDED for TH_FREE",1) intf_tbl._del("Ethernet0|fc00::1/126") @@ -422,10 +422,10 @@ def test_CrmIpv4Neighbor(self, dvs, testlog): assert new_avail_counter == avail_counter marker = dvs.add_log_marker() - dvs.runcmd("crm config polling interval 3") + dvs.runcmd("crm config polling interval 2") dvs.runcmd("crm config thresholds ipv4 neighbor high 90") dvs.runcmd("crm config thresholds ipv4 neighbor type free") - time.sleep(3) + time.sleep(2) check_syslog(dvs, marker, "IPV4_NEIGHBOR THRESHOLD_EXCEEDED for TH_FREE",1) intf_tbl._del("Ethernet0|10.0.0.0/31") @@ -481,10 +481,10 @@ def test_CrmIpv6Neighbor(self, dvs, testlog): assert new_avail_counter == avail_counter marker = dvs.add_log_marker() - dvs.runcmd("crm config polling interval 3") + dvs.runcmd("crm config polling interval 2") dvs.runcmd("crm config thresholds ipv6 neighbor high 90") dvs.runcmd("crm config thresholds ipv6 neighbor type free") - time.sleep(3) + time.sleep(2) check_syslog(dvs, marker, "IPV6_NEIGHBOR THRESHOLD_EXCEEDED for TH_FREE",1) intf_tbl._del("Ethernet0|fc00::1/126") @@ -549,10 +549,10 @@ def test_CrmNexthopGroup(self, dvs, testlog): assert new_avail_counter == avail_counter marker = dvs.add_log_marker() - dvs.runcmd("crm config polling interval 3") + dvs.runcmd("crm config polling interval 2") dvs.runcmd("crm config thresholds nexthop group member high 90") dvs.runcmd("crm config thresholds nexthop group object type free") - time.sleep(3) + time.sleep(2) check_syslog(dvs, marker, "NEXTHOP_GROUP THRESHOLD_EXCEEDED for TH_FREE",1) intf_tbl._del("Ethernet0|10.0.0.0/31") @@ -624,10 +624,10 @@ def test_CrmNexthopGroupMember(self, dvs, testlog): assert new_avail_counter == avail_counter marker = dvs.add_log_marker() - dvs.runcmd("crm config polling interval 3") + dvs.runcmd("crm config polling interval 2") dvs.runcmd("crm config thresholds nexthop group member high 90") dvs.runcmd("crm config thresholds nexthop group member type free") - time.sleep(3) + time.sleep(2) check_syslog(dvs, marker, "NEXTHOP_GROUP_MEMBER THRESHOLD_EXCEEDED for TH_FREE",1) intf_tbl._del("Ethernet0|10.0.0.0/31")