From ed776e38f69080febcc5b4d9db8d55b5101cbdf1 Mon Sep 17 00:00:00 2001 From: Christian Hopps Date: Sat, 19 Jun 2021 12:09:06 +0000 Subject: tests: apply KISS to retry fixture This python fixture was way too complex for what is needed. Eliminate gratuitous options/over-engineering: - Change from non-deterministic `wait` and `attempts` to a single `retry_timeout` value. This is both more deterministic, as well as what the user should actually be thinking about. - Use a fixed 2 second pause between executing the wrapped function rather than a bunch of arbitrary choices of 2, 3 and 4 seconds spread all over the test code. - Get rid of the multiple variables for determining what "Positive" and "Negative" results are. Instead just implement what all the user code already wants, i.e., boolean False or a str (errormsg) means "Negative" result otherwise it's a "Positive" result. - As part of the above the inversion logic is much more comprehensible in the fixture code (and more correct to boot). Signed-off-by: Christian Hopps --- tests/topotests/ospf_basic_functionality/test_ospf_ecmp.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tests/topotests/ospf_basic_functionality/test_ospf_ecmp.py') diff --git a/tests/topotests/ospf_basic_functionality/test_ospf_ecmp.py b/tests/topotests/ospf_basic_functionality/test_ospf_ecmp.py index 1aabc06db0..49ecaac9f7 100644 --- a/tests/topotests/ospf_basic_functionality/test_ospf_ecmp.py +++ b/tests/topotests/ospf_basic_functionality/test_ospf_ecmp.py @@ -326,7 +326,7 @@ def test_ospf_ecmp_tc16_p0(request): step("Verify that route is withdrawn from R2.") dut = "r1" result = verify_ospf_rib( - tgen, dut, input_dict, next_hop=nh, attempts=5, expected=False + tgen, dut, input_dict, next_hop=nh, retry_timeout=10, expected=False ) assert ( result is not True @@ -342,7 +342,7 @@ def test_ospf_ecmp_tc16_p0(request): input_dict, protocol=protocol, next_hop=nh, - attempts=5, + retry_timeout=10, expected=False, ) assert ( @@ -434,7 +434,7 @@ def test_ospf_ecmp_tc17_p0(request): step("Verify that route is withdrawn from R2.") dut = "r1" result = verify_ospf_rib( - tgen, dut, input_dict, next_hop=nh, attempts=5, expected=False + tgen, dut, input_dict, next_hop=nh, retry_timeout=10, expected=False ) assert ( result is not True @@ -450,7 +450,7 @@ def test_ospf_ecmp_tc17_p0(request): input_dict, protocol=protocol, next_hop=nh, - attempts=5, + retry_timeout=10, expected=False, ) assert ( -- cgit v1.2.3