aboutsummaryrefslogtreecommitdiffstats
path: root/test/filename_matching.py
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2017-07-30 01:14:59 +0200
committerMaximilian Hils <git@maximilianhils.com>2017-07-30 01:25:36 +0200
commited1ab3f0b10aea3ea964ef61af2605685909eac9 (patch)
tree57ed9b4b1fa83995605c5a32a0c97119cfe714d9 /test/filename_matching.py
parentb2f7995a038a5eff2e74f8326c0e8fe45155a049 (diff)
downloadmitmproxy-ed1ab3f0b10aea3ea964ef61af2605685909eac9.tar.gz
mitmproxy-ed1ab3f0b10aea3ea964ef61af2605685909eac9.tar.bz2
mitmproxy-ed1ab3f0b10aea3ea964ef61af2605685909eac9.zip
disentangle ProxyServer and Master classes.
The proxy server should ultimately be an addon itself and not be passed to the Master constructor. This commit already removes the server in the majority of instances, and also replaces a large number of ProxyConfig usages with the Options class..
Diffstat (limited to 'test/filename_matching.py')
-rw-r--r--test/filename_matching.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/filename_matching.py b/test/filename_matching.py
index 51cedf03..e74848d4 100644
--- a/test/filename_matching.py
+++ b/test/filename_matching.py
@@ -22,7 +22,7 @@ def check_src_files_have_test():
def check_test_files_have_src():
unknown_test_files = []
- excluded = ['test/mitmproxy/data/', 'test/mitmproxy/net/data/', '/tservers.py']
+ excluded = ['test/mitmproxy/data/', 'test/mitmproxy/net/data/', '/tservers.py', '/conftest.py']
test_files = glob.glob('test/mitmproxy/**/*.py', recursive=True) + glob.glob('test/pathod/**/*.py', recursive=True)
test_files = [f for f in test_files if os.path.basename(f) != '__init__.py']
test_files = [f for f in test_files if not any(os.path.normpath(p) in f for p in excluded)]