diff options
| author | Aldo Cortesi <aldo@corte.si> | 2018-04-26 11:47:07 +1200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-26 11:47:07 +1200 |
| commit | b18e0fa2bcac8b55b1d8325f4a2b1f916e3c0d9b (patch) | |
| tree | 332a42ef3dfd28ec0f4496b1f8ae79464f069069 /test/conftest.py | |
| parent | 5546f0a05ec21db986f0639cee9e89452ba68642 (diff) | |
| parent | 95e690ba31db9cb35eaa7e22ecebbe06ea8e2044 (diff) | |
| download | mitmproxy-b18e0fa2bcac8b55b1d8325f4a2b1f916e3c0d9b.tar.gz mitmproxy-b18e0fa2bcac8b55b1d8325f4a2b1f916e3c0d9b.tar.bz2 mitmproxy-b18e0fa2bcac8b55b1d8325f4a2b1f916e3c0d9b.zip | |
Merge pull request #3071 from cortesi/tickless
asyncio: shift script reloading out of the tick event
Diffstat (limited to 'test/conftest.py')
| -rw-r--r-- | test/conftest.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/test/conftest.py b/test/conftest.py index 27918cf9..7c7dec4a 100644 --- a/test/conftest.py +++ b/test/conftest.py @@ -1,6 +1,8 @@ import os import socket +from mitmproxy.utils import data + import pytest pytest_plugins = ('test.full_coverage_plugin',) @@ -33,3 +35,8 @@ skip_no_ipv6 = pytest.mark.skipif( no_ipv6, reason='Host has no IPv6 support' ) + + +@pytest.fixture() +def tdata(): + return data.Data(__name__) |