aboutsummaryrefslogtreecommitdiffstats
path: root/test/conftest.py
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@corte.si>2018-04-23 11:05:58 +1200
committerAldo Cortesi <aldo@nullcube.com>2018-04-23 19:16:33 +1200
commit95e690ba31db9cb35eaa7e22ecebbe06ea8e2044 (patch)
tree62f5a3ea58ef5a2b2f39b092df97fcd5b6d9f16d /test/conftest.py
parent0ba10b61090274a1f2ca70a8fb1d68830cb44607 (diff)
downloadmitmproxy-95e690ba31db9cb35eaa7e22ecebbe06ea8e2044.tar.gz
mitmproxy-95e690ba31db9cb35eaa7e22ecebbe06ea8e2044.tar.bz2
mitmproxy-95e690ba31db9cb35eaa7e22ecebbe06ea8e2044.zip
test: shift test_data out of our public API
Diffstat (limited to 'test/conftest.py')
-rw-r--r--test/conftest.py7
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__)