From 4b7f6ef9c5dcc7fdfea8a20d5afd27f118ac720b Mon Sep 17 00:00:00 2001 From: Brian Rutledge Date: Sun, 18 Dec 2022 10:52:13 -0500 Subject: [PATCH] Move integration ignore to pytest config (#964) --- pytest.ini | 1 + tox.ini | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pytest.ini b/pytest.ini index 608949b5..231448b8 100644 --- a/pytest.ini +++ b/pytest.ini @@ -7,3 +7,4 @@ filterwarnings= addopts = --disable-socket + --ignore-glob '*integration*.py' diff --git a/tox.ini b/tox.ini index b377d51b..358f6baa 100644 --- a/tox.ini +++ b/tox.ini @@ -13,16 +13,15 @@ deps = passenv = PYTEST_ADDOPTS commands = - python -m coverage run -m pytest --ignore-glob '*integration*.py' - python -m coverage html --show-contexts + python -m coverage run -m pytest {posargs} python -m coverage report -m --fail-under 97 + python -m coverage html --show-contexts [testenv:integration] deps = {[testenv]deps} pytest-rerunfailures pytest-services - build passenv = PYTEST_ADDOPTS commands =