3 files changed, 8 insertions, 5 deletions
diff --git a/tests/topotests/lib/common_config.py b/tests/topotests/lib/common_config.py
index a85b86668c..5d37b062ac 100644
--- a/tests/topotests/lib/common_config.py
+++ b/tests/topotests/lib/common_config.py
@@ -33,6 +33,7 @@ from lib.topogen import TopoRouter, get_topogen
 from lib.topolog import get_logger, logger
 from lib.topotest import frr_unicode, interface_set_status, version_cmp
 from lib import topotest
+from munet.testing.util import pause_test
 
 FRRCFG_FILE = "frr_json.conf"
 FRRCFG_BKUP_FILE = "frr_json_initial.conf"
@@ -2069,6 +2070,8 @@ def step(msg, reset=False):
     * ` msg` : Step message body.
     * `reset` : Reset step count to 1 when set to True.
     """
+    if bool(topotest.g_pytest_config.get_option("--pause")):
+        pause_test("before :" + msg)
     _step = Stepper()
     _step(msg, reset)
 
diff --git a/tests/topotests/mgmt_startup/test_bigconf.py b/tests/topotests/mgmt_startup/test_bigconf.py
index 465f646b6e..3b13229af5 100644
--- a/tests/topotests/mgmt_startup/test_bigconf.py
+++ b/tests/topotests/mgmt_startup/test_bigconf.py
@@ -69,10 +69,10 @@ def test_staticd_latestart(tgen):
     check_vtysh_up(r1)
     logging.info("r1: vtysh connected after %ss", track.elapsed())
 
-    result = check_kernel(r1, ROUTE_RANGE[0], retry_timeout=20)
+    result = check_kernel(r1, ROUTE_RANGE[0], retry_timeout=60)
     assert result is None
     logging.info("r1: first route installed after %ss", track.elapsed())
 
-    result = check_kernel(r1, ROUTE_RANGE[1], retry_timeout=20)
+    result = check_kernel(r1, ROUTE_RANGE[1], retry_timeout=60)
     assert result is None
     logging.info("r1: last route installed after %ss", track.elapsed())
diff --git a/tests/topotests/mgmt_startup/test_late_bigconf.py b/tests/topotests/mgmt_startup/test_late_bigconf.py
index ac7ac57cf8..5e594aba6c 100644
--- a/tests/topotests/mgmt_startup/test_late_bigconf.py
+++ b/tests/topotests/mgmt_startup/test_late_bigconf.py
@@ -68,9 +68,9 @@ def test_staticd_latestart(tgen):
     check_vtysh_up(r1)
     logging.info("r1: vtysh connected after %ss", track.elapsed())
 
-    result = check_kernel(r1, ROUTE_RANGE[0], retry_timeout=20, expected=False)
+    result = check_kernel(r1, ROUTE_RANGE[0], retry_timeout=60, expected=False)
     assert result is not None, "first route present and should not be"
-    result = check_kernel(r1, ROUTE_RANGE[1], retry_timeout=20, expected=False)
+    result = check_kernel(r1, ROUTE_RANGE[1], retry_timeout=60, expected=False)
     assert result is not None, "last route present and should not be"
 
     step("Starting staticd")
@@ -78,5 +78,5 @@ def test_staticd_latestart(tgen):
 
     result = check_kernel(r1, ROUTE_RANGE[0], retry_timeout=60)
     assert result is None, "first route not present and should be"
-    result = check_kernel(r1, ROUTE_RANGE[1], retry_timeout=20)
+    result = check_kernel(r1, ROUTE_RANGE[1], retry_timeout=60)
     assert result is None, "last route not present and should be"