diff options
| author |   Klement Sekera <ksekera@cisco.com> | 2018-03-14 18:14:49 +0100 |
|---|---|---|
| committer |   Damjan Marion <dmarion.lists@gmail.com> | 2018-03-14 19:14:54 +0000 |
| commit | 05742265d422e2c3b73aa62f3e0e460918655c77 (patch) | |
| tree | 9e187dfef3e404319c48e25c695f2c9bb44302b4 /test/run_tests.py | |
| parent | 5a72e425f9c2d5ca049fd05cd280c4bff5f73d57 (diff) | |
make test: early core detection, code cleanup
Change-Id: I503d69f902f1c8d3107fb3f2b9f31b0083ebb747
Signed-off-by: Klement Sekera <ksekera@cisco.com>
Diffstat (limited to 'test/run_tests.py')
| -rw-r--r-- | test/run_tests.py | 26 |
1 files changed, 24 insertions, 2 deletions
diff --git a/test/run_tests.py b/test/run_tests.py index a3d533633dc..419b8c679cb 100644 --- a/test/run_tests.py +++ b/test/run_tests.py @@ -13,6 +13,12 @@ from debug import spawn_gdb from log import global_logger from discover_tests import discover_tests +# timeout which controls how long the child has to finish after seeing +# a core dump in test temporary directory. If this is exceeded, parent assumes +# that child process is stuck (e.g. waiting for shm mutex, which will never +# get unlocked) and kill the child +core_timeout = 3 + def test_runner_wrapper(suite, keep_alive_pipe, result_pipe, failed_pipe): result = not VppTestRunner( @@ -62,6 +68,8 @@ def run_forked(suite): result = None failed = set() last_heard = time.time() + core_detected_at = None + debug_core = os.getenv("DEBUG", "").lower() == "core" while True: readable = select.select([keep_alive_parent_end.fileno(), result_parent_end.fileno(), @@ -82,7 +90,8 @@ def run_forked(suite): failed.add(failed_test.__name__) last_heard = time.time() fail = False - if last_heard + test_timeout < time.time(): + if last_heard + test_timeout < time.time() and \ + not os.path.isfile("%s/_core_handled" % last_test_temp_dir): fail = True global_logger.critical("Timeout while waiting for child test " "runner process (last test running was " @@ -93,6 +102,19 @@ def run_forked(suite): global_logger.critical("Child process unexpectedly died (last " "test running was `%s' in `%s')!" % (last_test, last_test_temp_dir)) + elif last_test_temp_dir and last_test_vpp_binary: + core_path = "%s/core" % last_test_temp_dir + if os.path.isfile(core_path): + if core_detected_at is None: + core_detected_at = time.time() + elif core_detected_at + core_timeout < time.time(): + if not os.path.isfile( + "%s/_core_handled" % last_test_temp_dir): + global_logger.critical( + "Child unresponsive and core-file exists in test " + "temporary directory!") + fail = True + if fail: failed_dir = os.getenv('VPP_TEST_FAILED_DIR') lttd = last_test_temp_dir.split("/")[-1] @@ -113,7 +135,7 @@ def run_forked(suite): if os.path.isfile(core_path): global_logger.error("Core-file exists in test temporary " "directory: %s!" % core_path) - if d and d.lower() == "core": + if debug_core: spawn_gdb(last_test_vpp_binary, core_path, global_logger) child.terminate() |