summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--pytest.ini1
-rw-r--r--tests/end2end/fixtures/testprocess.py6
2 files changed, 6 insertions, 1 deletions
diff --git a/pytest.ini b/pytest.ini
index 68c3676c7..f936a02cb 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -81,4 +81,5 @@ filterwarnings =
error
# See https://github.com/HypothesisWorks/hypothesis/issues/2370
ignore:.*which is reset between function calls but not between test cases generated by:hypothesis.errors.HypothesisDeprecationWarning
+ default:Test process .* failed to terminate!:UserWarning
faulthandler_timeout = 90
diff --git a/tests/end2end/fixtures/testprocess.py b/tests/end2end/fixtures/testprocess.py
index 814d16806..85778c3e0 100644
--- a/tests/end2end/fixtures/testprocess.py
+++ b/tests/end2end/fixtures/testprocess.py
@@ -22,6 +22,7 @@
import re
import os
import time
+import warnings
import attr
import pytest
@@ -316,8 +317,11 @@ class Process(QObject):
else:
self.proc.terminate()
- ok = self.proc.waitForFinished()
+ ok = self.proc.waitForFinished(5000)
if not ok:
+ cmdline = ' '.join([self.proc.program()] + self.proc.arguments())
+ warnings.warn(f"Test process {cmdline} with PID {self.proc.processId()} "
+ "failed to terminate!")
self.proc.kill()
self.proc.waitForFinished()