Merge pull request #230 from ClearcodeHQ/dependabot/pip/mirakuru-2.2.0

Bump mirakuru from 2.1.2 to 2.2.0
ClearcodeHQ · Feb 19, 2020 · e10e07e · e10e07e
2 parents 64f7896 + f21fe2f
commit e10e07e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -5,6 +5,8 @@ unreleased
 -------
 
 - [cleanup] Drop support for python versions older than 3.6
+- [fix] Adjust for mirakuru 2.2.0 and up
+
 
 2.0.0
 -------

diff --git a/requirements-test.txt b/requirements-test.txt
@@ -5,6 +5,6 @@ pytest-cov==2.8.1
 coverage==5.0.3 # pytest-cov
 mock==4.0.1
 port-for==0.4
-mirakuru==2.1.2
+mirakuru==2.2.0
 elasticsearch==7.5.1
 -e .[tests]
diff --git a/src/pytest_elasticsearch/factories.py b/src/pytest_elasticsearch/factories.py
@@ -22,6 +22,7 @@
 
 import pytest
 from elasticsearch import Elasticsearch
+from mirakuru import ProcessExitedWithError
 
 from pytest_elasticsearch.executor import (
     ElasticSearchExecutor,
@@ -122,8 +123,12 @@ def elasticsearch_proc_fixture(request):
             timeout=60,
         )
 
-        with elasticsearch_executor:
-            yield elasticsearch_executor
+        elasticsearch_executor.start()
+        yield elasticsearch_executor
+        try:
+            elasticsearch_executor.stop()
+        except ProcessExitedWithError:
+            pass
         shutil.rmtree(work_path)
         shutil.rmtree(logs_path)