From: Rafael Zalamena <rzalamena@opensourcerouting.org>
Date: Mon, 22 Jul 2019 16:16:35 +0000 (-0300)
Subject: topotest: improve common_config.py
X-Git-Tag: base_7.2~124^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=91c939dc12593de59316eb998301ec66f1b2eaa3;p=mirror%2Ffrr.git

topotest: improve common_config.py

Don't wait for `True` results when the return type is a string.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
---

diff --git a/tests/topotests/bgp-prefix-list-topo1/test_prefix_lists.py b/tests/topotests/bgp-prefix-list-topo1/test_prefix_lists.py
index 25a346f20d..d3892e9d07 100755
--- a/tests/topotests/bgp-prefix-list-topo1/test_prefix_lists.py
+++ b/tests/topotests/bgp-prefix-list-topo1/test_prefix_lists.py
@@ -385,7 +385,7 @@ def test_ip_prefix_lists_out_permit(request):
     assert result is True, "Testcase {} : Failed \n Error: {}".format(
         tc_name, result)
 
-    result = verify_rib(tgen, "ipv4", dut, input_dict, protocol=protocol)
+    result = verify_rib(tgen, "ipv4", dut, input_dict, protocol=protocol, expected=False)
     assert result is not True, "Testcase {} : Failed \n Error: {}".format(
         tc_name, result)
     write_test_footer(tc_name)
@@ -496,7 +496,7 @@ def test_ip_prefix_lists_in_deny_and_permit_any(request):
     # Verifying RIB routes
     dut = "r3"
     protocol = "bgp"
-    result = verify_rib(tgen, "ipv4", dut, input_dict, protocol=protocol)
+    result = verify_rib(tgen, "ipv4", dut, input_dict, protocol=protocol, expected=False)
     assert result is not True, "Testcase {} : Failed \n Error: {}".format(
         tc_name, result)
 
@@ -713,7 +713,7 @@ def test_ip_prefix_lists_out_deny_and_permit_any(request):
     # Verifying RIB routes
     dut = "r4"
     protocol = "bgp"
-    result = verify_rib(tgen, "ipv4", dut, input_dict, protocol=protocol)
+    result = verify_rib(tgen, "ipv4", dut, input_dict, protocol=protocol, expected=False)
     assert result is not True, "Testcase {} : Failed \n Error: {}".format(
         tc_name, result)
 
@@ -858,7 +858,7 @@ def test_modify_prefix_lists_in_permit_to_deny(request):
     # Verifying RIB routes
     dut = "r3"
     protocol = "bgp"
-    result = verify_rib(tgen, "ipv4", dut, input_dict, protocol=protocol)
+    result = verify_rib(tgen, "ipv4", dut, input_dict, protocol=protocol, expected=False)
     assert result is not True, "Testcase {} : Failed \n Error: {}".format(
         tc_name, result)
 
@@ -971,7 +971,7 @@ def test_modify_prefix_lists_in_deny_to_permit(request):
     # Verifying RIB routes
     dut = "r3"
     protocol = "bgp"
-    result = verify_rib(tgen, "ipv4", dut, input_dict, protocol=protocol)
+    result = verify_rib(tgen, "ipv4", dut, input_dict, protocol=protocol, expected=False)
     assert result is not True, "Testcase {} : Failed \n Error: {}".format(
         tc_name, result)
 
@@ -1151,7 +1151,7 @@ def test_modify_prefix_lists_out_permit_to_deny(request):
     # Verifying RIB routes
     dut = "r4"
     protocol = "bgp"
-    result = verify_rib(tgen, "ipv4", dut, input_dict, protocol=protocol)
+    result = verify_rib(tgen, "ipv4", dut, input_dict, protocol=protocol, expected=False)
     assert result is not True, "Testcase {} : Failed \n Error: {}".format(
         tc_name, result)
 
@@ -1264,7 +1264,7 @@ def test_modify_prefix_lists_out_deny_to_permit(request):
     # Verifying RIB routes
     dut = "r4"
     protocol = "bgp"
-    result = verify_rib(tgen, "ipv4", dut, input_dict, protocol=protocol)
+    result = verify_rib(tgen, "ipv4", dut, input_dict, protocol=protocol, expected=False)
     assert result is not True, "Testcase {} : Failed \n Error: {}".format(
         tc_name, result)
 
@@ -1438,7 +1438,7 @@ def test_ip_prefix_lists_implicit_deny(request):
     # Verifying RIB routes
     dut = "r4"
     protocol = "bgp"
-    result = verify_rib(tgen, "ipv4", dut, input_dict_1, protocol=protocol)
+    result = verify_rib(tgen, "ipv4", dut, input_dict_1, protocol=protocol, expected=False)
     assert result is not True, "Testcase {} : Failed \n Error: {}".format(
         tc_name, result)
 
diff --git a/tests/topotests/lib/common_config.py b/tests/topotests/lib/common_config.py
index a2ad307f8b..75880cfd28 100644
--- a/tests/topotests/lib/common_config.py
+++ b/tests/topotests/lib/common_config.py
@@ -1261,14 +1261,21 @@ def _verify_rib(tgen, addr_type, dut, input_dict, next_hop=None, protocol=None):
     return True
 
 
-def verify_rib(tgen, addr_type, dut, input_dict, next_hop=None, protocol=None):
-    "Wrapper function for `_verify_rib` that tries multiple time to get results."
+def verify_rib(tgen, addr_type, dut, input_dict, next_hop=None, protocol=None, expected=True):
+    """
+    Wrapper function for `_verify_rib` that tries multiple time to get results.
+
+    When the expected result is `False` we actually should expect for an string instead.
+    """
 
     # Use currying to hide the parameters and create a test function.
     test_func = partial(_verify_rib, tgen, addr_type, dut, input_dict, next_hop, protocol)
 
     # Call the test function and expect it to return True, otherwise try it again.
-    _, result = topotest.run_and_expect(test_func, True, count=20, wait=6)
+    if expected is True:
+        _, result = topotest.run_and_expect(test_func, True, count=20, wait=6)
+    else:
+        _, result = topotest.run_and_expect_type(test_func, str, count=20, wait=6)
 
     # Return as normal.
     return result