diff --git a/test/case/routing/rip_basic/test.py b/test/case/routing/rip_basic/test.py index e6976c196..9189d76bb 100755 --- a/test/case/routing/rip_basic/test.py +++ b/test/case/routing/rip_basic/test.py @@ -186,8 +186,8 @@ def config_target2(target, link, data): _, R1link = env.ltop.xlate("R1", "link") _, R2data = env.ltop.xlate("R2", "data") - parallel(config_target1(R1, R1data, R1link), - config_target2(R2, R2link, R2data)) + parallel(lambda: config_target1(R1, R1data, R1link), + lambda: config_target2(R2, R2link, R2data)) with test.step("Wait for RIP routes to be exchanged"): print("Waiting for RIP routes to propagate...") @@ -197,6 +197,8 @@ def config_target2(target, link, data): until(lambda: route.ipv4_route_exist(R2, "192.168.100.1/32", proto="ietf-rip:rip"), attempts=40) # R2 should learn R1's static route (redistributed) until(lambda: route.ipv4_route_exist(R2, "192.168.33.1/32", proto="ietf-rip:rip"), attempts=40) + until(lambda: route.ipv4_route_exist(R2, "192.168.10.0/24", proto="ietf-rip:rip"), attempts=40) + until(lambda: route.ipv4_route_exist(R1, "192.168.60.0/24", proto="ietf-rip:rip"), attempts=40) with test.step("Test connectivity from PC:data1 to R2 loopback via RIP"): _, hport0 = env.ltop.xlate("PC", "data1") diff --git a/test/case/routing/rip_multihop/test.py b/test/case/routing/rip_multihop/test.py index 44ff528a2..527e67d43 100755 --- a/test/case/routing/rip_multihop/test.py +++ b/test/case/routing/rip_multihop/test.py @@ -246,9 +246,9 @@ def config_r3(target, link, data): _, R3link = env.ltop.xlate("R3", "link") _, R3data = env.ltop.xlate("R3", "data") - parallel(config_r1(R1, R1data, R1link), - config_r2(R2, R2west, R2east), - config_r3(R3, R3link, R3data)) + parallel(lambda: config_r1(R1, R1data, R1link), + lambda: config_r2(R2, R2west, R2east), + lambda: config_r3(R3, R3link, R3data)) with test.step("Wait for RIP routes to be exchanged"): print("Waiting for RIP routes to propagate...") @@ -264,6 +264,10 @@ def config_r3(target, link, data): until(lambda: route.ipv4_route_exist(R3, "192.168.22.1/32", proto="ietf-rip:rip"), attempts=40) # R3 should learn R1's loopback (via R2) until(lambda: route.ipv4_route_exist(R3, "192.168.11.1/32", proto="ietf-rip:rip"), attempts=40) + until(lambda: route.ipv4_route_exist(R2, "192.168.10.0/24", proto="ietf-rip:rip"), attempts=40) + until(lambda: route.ipv4_route_exist(R3, "192.168.10.0/24", proto="ietf-rip:rip"), attempts=40) + until(lambda: route.ipv4_route_exist(R2, "192.168.70.0/24", proto="ietf-rip:rip"), attempts=40) + until(lambda: route.ipv4_route_exist(R1, "192.168.70.0/24", proto="ietf-rip:rip"), attempts=40) with test.step("Verify R2 has two RIP neighbors"): print("Checking R2 has two RIP neighbors...")