1 files changed, 23 insertions, 0 deletions
diff --git a/tests/topotests/conftest.py b/tests/topotests/conftest.py
index e57db7471c..d119b0931b 100755
--- a/tests/topotests/conftest.py
+++ b/tests/topotests/conftest.py
@@ -26,6 +26,12 @@ def pytest_addoption(parser):
     only run the setup_module() to setup the topology without running any tests.
     """
     parser.addoption(
+        "--asan-abort",
+        action="store_true",
+        help="Configure address sanitizer to abort process on error",
+    )
+
+    parser.addoption(
         "--gdb-breakpoints",
         metavar="SYMBOL[,SYMBOL...]",
         help="Comma-separated list of functions to set gdb breakpoints on",
@@ -68,6 +74,12 @@ def pytest_addoption(parser):
     )
 
     parser.addoption(
+        "--strace-daemons",
+        metavar="DAEMON[,DAEMON...]",
+        help="Comma-separated list of daemons to strace, or 'all'",
+    )
+
+    parser.addoption(
         "--topology-only",
         action="store_true",
         default=False,
@@ -167,6 +179,9 @@ def pytest_configure(config):
     if not diagnose_env():
         pytest.exit("environment has errors, please read the logs")
 
+    asan_abort = config.getoption("--asan-abort")
+    topotest_extra_config["asan_abort"] = asan_abort
+
     gdb_routers = config.getoption("--gdb-routers")
     gdb_routers = gdb_routers.split(",") if gdb_routers else []
     topotest_extra_config["gdb_routers"] = gdb_routers
@@ -185,6 +200,9 @@ def pytest_configure(config):
     shell = config.getoption("--shell")
     topotest_extra_config["shell"] = shell.split(",") if shell else []
 
+    strace = config.getoption("--strace-daemons")
+    topotest_extra_config["strace_daemons"] = strace.split(",") if strace else []
+
     pause_after = config.getoption("--pause-after")
 
     shell_on_error = config.getoption("--shell-on-error")
@@ -244,6 +262,11 @@ def pytest_runtest_makereport(item, call):
                 )
             )
 
+            # We want to pause, if requested, on any error not just test cases
+            # (e.g., call.when == "setup")
+            if not pause:
+                pause = topotest_extra_config["pause_after"]
+
             # (topogen) Set topology error to avoid advancing in the test.
             tgen = get_topogen()
             if tgen is not None: