From 184ab61ee3386ece1ade1113e4e3d73d7a58aeb2 Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Tue, 5 Apr 2022 09:26:18 -0400 Subject: [PATCH 1/2] tests: Fix test_multicast_pim_sm_topo3.py from generating a support bundle The test_multicast_pim_sm_topo3.py test is both spending extra time looking for state that will never occurr but also generating a support bundle when it doesn't find it. Fix the test to come to the correct solution faster. Signed-off-by: Donald Sharp --- .../multicast_pim_sm_topo3/test_multicast_pim_sm_topo3.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/tests/topotests/multicast_pim_sm_topo3/test_multicast_pim_sm_topo3.py b/tests/topotests/multicast_pim_sm_topo3/test_multicast_pim_sm_topo3.py index 304128e44c..72d6d0cbc9 100755 --- a/tests/topotests/multicast_pim_sm_topo3/test_multicast_pim_sm_topo3.py +++ b/tests/topotests/multicast_pim_sm_topo3/test_multicast_pim_sm_topo3.py @@ -2834,9 +2834,7 @@ def test_mroute_after_removing_RP_sending_IGMP_prune_p2(request): intf_f1_i8 = topo["routers"]["f1"]["links"]["i8"]["interface"] input_traffic = {"f1": {"traffic_sent": [intf_f1_i8]}} - traffic_before = verify_multicast_traffic( - tgen, input_traffic, return_traffic=True, expected=False - ) + traffic_before = verify_multicast_traffic(tgen, input_traffic, return_traffic=True) assert isinstance(traffic_before, dict), ( "Testcase {} : Failed \n traffic_before is not dictionary \n " "Error: {}".format(tc_name, result) @@ -2861,9 +2859,7 @@ def test_mroute_after_removing_RP_sending_IGMP_prune_p2(request): intf_f1_i8 = topo["routers"]["f1"]["links"]["i8"]["interface"] input_traffic = {"f1": {"traffic_sent": [intf_f1_i8]}} - traffic_after = verify_multicast_traffic( - tgen, input_traffic, return_traffic=True, expected=False - ) + traffic_after = verify_multicast_traffic(tgen, input_traffic, return_traffic=True) assert isinstance(traffic_after, dict), ( "Testcase {} : Failed \n traffic_after is not dictionary \n " "Error: {}".format(tc_name, result) From 747aa92e74f688f2af67002b9acdfcea94bd7e7b Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Sun, 10 Apr 2022 07:47:01 -0400 Subject: [PATCH 2/2] tests: Do not turn off multicast stream The test is testing whether interface flaps are causing the appropriate pim reactions. Unfortunately the test is turning off the multicast stream and the test also has a keep alive timer of 15 seconds set on all routers. Which of course means the test has 15 seconds(at most) to finish testing. This is not always possible given system loads. Signed-off-by: Donald Sharp --- .../multicast_pim_sm_topo3/test_multicast_pim_sm_topo3.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tests/topotests/multicast_pim_sm_topo3/test_multicast_pim_sm_topo3.py b/tests/topotests/multicast_pim_sm_topo3/test_multicast_pim_sm_topo3.py index 72d6d0cbc9..6f3867cc2c 100755 --- a/tests/topotests/multicast_pim_sm_topo3/test_multicast_pim_sm_topo3.py +++ b/tests/topotests/multicast_pim_sm_topo3/test_multicast_pim_sm_topo3.py @@ -3270,8 +3270,6 @@ def test_prune_sent_to_LHR_and_FHR_when_PIMnbr_down_p2(request): intf_r2_l1 = topo["routers"]["r2"]["links"]["l1"]["interface"] shutdown_bringup_interface(tgen, "r2", intf_r2_l1, False) - app_helper.stop_host("i2") - step("Verify RP info after Shut the link from FHR to RP from RP node") dut = "l1" rp_address = "1.0.5.17" @@ -3422,8 +3420,6 @@ def test_prune_sent_to_LHR_and_FHR_when_PIMnbr_down_p2(request): step("Verify PIM Nbrs after Shut the link from FHR to RP from FHR node") - app_helper.stop_host("i6") - step("Verify RP info after Shut the link from FHR to RP from FHR node") dut = "l1" rp_address = "1.0.5.17"