Merge pull request #223 from nsano-rururu/pytest612to624

Bump pytest form 6.1.2 to 6.2.4
jertel · Jun 4, 2021 · 2455b74 · 2455b74
2 parents 95573c1 + 1f85a05
commit 2455b74
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/pytest.ini b/pytest.ini
@@ -1,3 +1,5 @@
 [pytest]
 markers =
     elasticsearch: mark a test as using elasticsearch.
+filterwarnings =
+    ignore::pytest.PytestUnhandledThreadExceptionWarning
diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -7,7 +7,7 @@ m2r2
 pluggy>=0.12.0
 pre-commit
 pylint<2.9
-pytest==6.1.2
+pytest==6.2.4
 pytest-xdist==2.2.1
 setuptools
 sphinx_rtd_theme

diff --git a/tox.ini b/tox.ini
@@ -5,7 +5,7 @@ envlist = py39,docs
 [testenv]
 deps = -rrequirements-dev.txt
 commands =
-    pytest --cov=elastalert --cov-report=term-missing --cov-branch --strict tests/ -n 4 {posargs}
+    pytest --cov=elastalert --cov-report=term-missing --cov-branch --strict-markers tests/ -n 4 {posargs}
     flake8 .
 
 [testenv:lint]