Merge pull request pytest-dev#124 from manahl/xfang-suppress-stacktrace

pytest-server-fixtures: suppress stacktrace if kill() is called
mgorny · Feb 20, 2019 · 56fbb1c · 56fbb1c
2 parents 0179e66 + 3553d7a
commit 56fbb1c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -3,6 +3,7 @@
 
 ### 1.6.1 (Unrelease)
  * pytest-server-fixtures: fix exception when attempting to access hostname while server is not started
+ * pytest-server-fixtures: suppress stacktrace if kill() is called
 
 ### 1.6.0 (2019-02-12)
  * pytest-server-fixtures: added previously removed TestServerV2.kill() function

diff --git a/pytest-server-fixtures/pytest_server_fixtures/base2.py b/pytest-server-fixtures/pytest_server_fixtures/base2.py
@@ -84,6 +84,10 @@ def kill(self):
         if not self._server:
             log.debug("Server not started yet, skipping")
             return
+
+        # Prevent traceback printed when the server goes away as we kill it
+        self._server.exit = True
+
         self._server.teardown()
         self._server = None
         self._killed = True