From a53c1f0a8d6b0ea0d550a83f2dd4f2f6041ccc2a Mon Sep 17 00:00:00 2001 From: Kyle Altendorf Date: Sun, 30 Aug 2020 10:06:14 -0400 Subject: [PATCH 1/2] switch to pytest-trio --- pytest.ini | 2 ++ test-requirements.txt | 1 + trimeter/_tests/conftest.py | 21 --------------------- 3 files changed, 3 insertions(+), 21 deletions(-) create mode 100644 pytest.ini delete mode 100644 trimeter/_tests/conftest.py diff --git a/pytest.ini b/pytest.ini new file mode 100644 index 0000000..5f4a13a --- /dev/null +++ b/pytest.ini @@ -0,0 +1,2 @@ +[pytest] +trio_mode = true diff --git a/test-requirements.txt b/test-requirements.txt index 9955dec..875b940 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,2 +1,3 @@ pytest pytest-cov +pytest-trio diff --git a/trimeter/_tests/conftest.py b/trimeter/_tests/conftest.py deleted file mode 100644 index 25c5453..0000000 --- a/trimeter/_tests/conftest.py +++ /dev/null @@ -1,21 +0,0 @@ -# XX this should switch to using pytest-trio as soon as pytest-trio is -# released... - -import inspect -import pytest -from trio.testing import MockClock, trio_test - -@pytest.fixture -def mock_clock(): - return MockClock() - - -@pytest.fixture -def autojump_clock(): - return MockClock(autojump_threshold=0) - - -@pytest.hookimpl(tryfirst=True) -def pytest_pyfunc_call(pyfuncitem): - if inspect.iscoroutinefunction(pyfuncitem.obj): - pyfuncitem.obj = trio_test(pyfuncitem.obj) From af2079a6d115611343b6a0b245767b1df6c9fcdc Mon Sep 17 00:00:00 2001 From: Quentin Pradet Date: Thu, 3 Sep 2020 09:35:53 +0400 Subject: [PATCH 2/2] Regenerate test-requirements.txt --- test-requirements.txt | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/test-requirements.txt b/test-requirements.txt index 0afeda4..2afa25f 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -4,17 +4,24 @@ # # pip-compile --output-file=test-requirements.txt test-requirements.in # -attrs==20.1.0 # via pytest +async-generator==1.10 # via pytest-trio, trio +attrs==20.1.0 # via outcome, pytest, trio coverage==5.2.1 # via pytest-cov +idna==2.10 # via trio importlib-metadata==1.7.0 # via pluggy, pytest iniconfig==1.0.1 # via pytest more-itertools==8.5.0 # via pytest +outcome==1.0.1 # via pytest-trio, trio packaging==20.4 # via pytest pluggy==0.13.1 # via pytest py==1.9.0 # via pytest pyparsing==2.4.7 # via packaging pytest-cov==2.10.1 # via -r test-requirements.in -pytest==6.0.1 # via -r test-requirements.in, pytest-cov +pytest-trio==0.6.0 # via -r test-requirements.in +pytest==6.0.1 # via -r test-requirements.in, pytest-cov, pytest-trio six==1.15.0 # via packaging +sniffio==1.1.0 # via trio +sortedcontainers==2.2.2 # via trio toml==0.10.1 # via pytest +trio==0.16.0 # via pytest-trio zipp==3.1.0 # via importlib-metadata