move tests into shared folder

170 files changed, 0 insertions, 0 deletions

diff --git a/netlib/test/__init__.py b/test/__init__.py
index e69de29b..e69de29b 100644
--- a/netlib/test/__init__.py
+++ b/test/__init__.py
diff --git a/mitmproxy/test/__init__.py b/test/mitmproxy/__init__.py
index 61d03152..61d03152 100644
--- a/mitmproxy/test/__init__.py
+++ b/test/mitmproxy/__init__.py
diff --git a/mitmproxy/test/completion/aaa b/test/mitmproxy/completion/aaa
index e69de29b..e69de29b 100644
--- a/mitmproxy/test/completion/aaa
+++ b/test/mitmproxy/completion/aaa
diff --git a/mitmproxy/test/completion/aab b/test/mitmproxy/completion/aab
index e69de29b..e69de29b 100644
--- a/mitmproxy/test/completion/aab
+++ b/test/mitmproxy/completion/aab
diff --git a/mitmproxy/test/completion/aac b/test/mitmproxy/completion/aac
index e69de29b..e69de29b 100644
--- a/mitmproxy/test/completion/aac
+++ b/test/mitmproxy/completion/aac
diff --git a/mitmproxy/test/data/1.css b/test/mitmproxy/data/1.css
index 33387ca7..33387ca7 100644
--- a/mitmproxy/test/data/1.css
+++ b/test/mitmproxy/data/1.css
diff --git a/mitmproxy/test/data/amf01 b/test/mitmproxy/data/amf01
index c8fc261d..c8fc261d 100644
--- a/mitmproxy/test/data/amf01
+++ b/test/mitmproxy/data/amf01
diff --git a/mitmproxy/test/data/amf02 b/test/mitmproxy/data/amf02
index ba69f130..ba69f130 100644
--- a/mitmproxy/test/data/amf02
+++ b/test/mitmproxy/data/amf02
diff --git a/mitmproxy/test/data/amf03 b/test/mitmproxy/data/amf03
index d9fa736a..d9fa736a 100644
--- a/mitmproxy/test/data/amf03
+++ b/test/mitmproxy/data/amf03
diff --git a/mitmproxy/test/data/clientcert/.gitignore b/test/mitmproxy/data/clientcert/.gitignore
index 07bc53d2..07bc53d2 100644
--- a/mitmproxy/test/data/clientcert/.gitignore
+++ b/test/mitmproxy/data/clientcert/.gitignore
diff --git a/mitmproxy/test/data/clientcert/127.0.0.1.pem b/test/mitmproxy/data/clientcert/127.0.0.1.pem
index d7093b76..d7093b76 100644
--- a/mitmproxy/test/data/clientcert/127.0.0.1.pem
+++ b/test/mitmproxy/data/clientcert/127.0.0.1.pem
diff --git a/mitmproxy/test/data/clientcert/client.cnf b/test/mitmproxy/data/clientcert/client.cnf
index 5046a944..5046a944 100644
--- a/mitmproxy/test/data/clientcert/client.cnf
+++ b/test/mitmproxy/data/clientcert/client.cnf
diff --git a/mitmproxy/test/data/clientcert/client.pem b/test/mitmproxy/data/clientcert/client.pem
index 322e07e0..322e07e0 100644
--- a/mitmproxy/test/data/clientcert/client.pem
+++ b/test/mitmproxy/data/clientcert/client.pem
diff --git a/mitmproxy/test/data/clientcert/make b/test/mitmproxy/data/clientcert/make
index e829952d..e829952d 100644
--- a/mitmproxy/test/data/clientcert/make
+++ b/test/mitmproxy/data/clientcert/make
diff --git a/mitmproxy/test/data/confdir/mitmproxy-ca-cert.cer b/test/mitmproxy/data/confdir/mitmproxy-ca-cert.cer
index cc7f8f19..cc7f8f19 100644
--- a/mitmproxy/test/data/confdir/mitmproxy-ca-cert.cer
+++ b/test/mitmproxy/data/confdir/mitmproxy-ca-cert.cer
diff --git a/mitmproxy/test/data/confdir/mitmproxy-ca-cert.p12 b/test/mitmproxy/data/confdir/mitmproxy-ca-cert.p12
index d4cec0d4..d4cec0d4 100644
--- a/mitmproxy/test/data/confdir/mitmproxy-ca-cert.p12
+++ b/test/mitmproxy/data/confdir/mitmproxy-ca-cert.p12
diff --git a/mitmproxy/test/data/confdir/mitmproxy-ca-cert.pem b/test/mitmproxy/data/confdir/mitmproxy-ca-cert.pem
index cc7f8f19..cc7f8f19 100644
--- a/mitmproxy/test/data/confdir/mitmproxy-ca-cert.pem
+++ b/test/mitmproxy/data/confdir/mitmproxy-ca-cert.pem
diff --git a/mitmproxy/test/data/confdir/mitmproxy-ca.pem b/test/mitmproxy/data/confdir/mitmproxy-ca.pem
index 2a2343a6..2a2343a6 100644
--- a/mitmproxy/test/data/confdir/mitmproxy-ca.pem
+++ b/test/mitmproxy/data/confdir/mitmproxy-ca.pem
diff --git a/mitmproxy/test/data/dercert b/test/mitmproxy/data/dercert
index 370252af..370252af 100644
--- a/mitmproxy/test/data/dercert
+++ b/test/mitmproxy/data/dercert
diff --git a/mitmproxy/test/data/dumpfile-012 b/test/mitmproxy/data/dumpfile-012
index 49c2350d..49c2350d 100644
--- a/mitmproxy/test/data/dumpfile-012
+++ b/test/mitmproxy/data/dumpfile-012
diff --git a/mitmproxy/test/data/dumpfile-013 b/test/mitmproxy/data/dumpfile-013
index ede06f23..ede06f23 100644
--- a/mitmproxy/test/data/dumpfile-013
+++ b/test/mitmproxy/data/dumpfile-013
diff --git a/mitmproxy/test/data/htpasswd b/test/mitmproxy/data/htpasswd
index 54c95b8c..54c95b8c 100644
--- a/mitmproxy/test/data/htpasswd
+++ b/test/mitmproxy/data/htpasswd
diff --git a/mitmproxy/test/data/htpasswd.invalid b/test/mitmproxy/data/htpasswd.invalid
index 257cc564..257cc564 100644
--- a/mitmproxy/test/data/htpasswd.invalid
+++ b/test/mitmproxy/data/htpasswd.invalid
diff --git a/mitmproxy/test/data/image-err1.jpg b/test/mitmproxy/data/image-err1.jpg
index 1b251e6e..1b251e6e 100644
--- a/mitmproxy/test/data/image-err1.jpg
+++ b/test/mitmproxy/data/image-err1.jpg
diff --git a/mitmproxy/test/data/image.gif b/test/mitmproxy/data/image.gif
index 91c53284..91c53284 100644
--- a/mitmproxy/test/data/image.gif
+++ b/test/mitmproxy/data/image.gif
diff --git a/mitmproxy/test/data/image.ico b/test/mitmproxy/data/image.ico
index 4a8421dc..4a8421dc 100644
--- a/mitmproxy/test/data/image.ico
+++ b/test/mitmproxy/data/image.ico
diff --git a/mitmproxy/test/data/image.jpg b/test/mitmproxy/data/image.jpg
index 6cbe081e..6cbe081e 100644
--- a/mitmproxy/test/data/image.jpg
+++ b/test/mitmproxy/data/image.jpg
diff --git a/mitmproxy/test/data/image.png b/test/mitmproxy/data/image.png
index 33143e77..33143e77 100644
--- a/mitmproxy/test/data/image.png
+++ b/test/mitmproxy/data/image.png
diff --git a/mitmproxy/test/data/no_common_name.pem b/test/mitmproxy/data/no_common_name.pem
index fc271a0e..fc271a0e 100644
--- a/mitmproxy/test/data/no_common_name.pem
+++ b/test/mitmproxy/data/no_common_name.pem
diff --git a/mitmproxy/test/data/pf01 b/test/mitmproxy/data/pf01
index 3139a289..3139a289 100644
--- a/mitmproxy/test/data/pf01
+++ b/test/mitmproxy/data/pf01
diff --git a/mitmproxy/test/data/pf02 b/test/mitmproxy/data/pf02
index e4dc18b3..e4dc18b3 100644
--- a/mitmproxy/test/data/pf02
+++ b/test/mitmproxy/data/pf02
diff --git a/mitmproxy/test/data/protobuf01 b/test/mitmproxy/data/protobuf01
index fbfdbff3..fbfdbff3 100644
--- a/mitmproxy/test/data/protobuf01
+++ b/test/mitmproxy/data/protobuf01
diff --git a/mitmproxy/test/data/replace b/test/mitmproxy/data/replace
index ad8e760a..ad8e760a 100644
--- a/mitmproxy/test/data/replace
+++ b/test/mitmproxy/data/replace
diff --git a/mitmproxy/test/data/testkey.pem b/test/mitmproxy/data/testkey.pem
index af8d9d8f..af8d9d8f 100644
--- a/mitmproxy/test/data/testkey.pem
+++ b/test/mitmproxy/data/testkey.pem
diff --git a/mitmproxy/test/data/trusted-cadir/8117bdb9.0 b/test/mitmproxy/data/trusted-cadir/8117bdb9.0
index ae78b546..ae78b546 100644
--- a/mitmproxy/test/data/trusted-cadir/8117bdb9.0
+++ b/test/mitmproxy/data/trusted-cadir/8117bdb9.0
diff --git a/mitmproxy/test/data/trusted-cadir/9d45e6a9.0 b/test/mitmproxy/data/trusted-cadir/9d45e6a9.0
index ae78b546..ae78b546 100644
--- a/mitmproxy/test/data/trusted-cadir/9d45e6a9.0
+++ b/test/mitmproxy/data/trusted-cadir/9d45e6a9.0
diff --git a/mitmproxy/test/data/trusted-cadir/trusted-ca.pem b/test/mitmproxy/data/trusted-cadir/trusted-ca.pem
index ae78b546..ae78b546 100644
--- a/mitmproxy/test/data/trusted-cadir/trusted-ca.pem
+++ b/test/mitmproxy/data/trusted-cadir/trusted-ca.pem
diff --git a/mitmproxy/test/data/trusted-server.crt b/test/mitmproxy/data/trusted-server.crt
index 76f8559a..76f8559a 100644
--- a/mitmproxy/test/data/trusted-server.crt
+++ b/test/mitmproxy/data/trusted-server.crt
diff --git a/mitmproxy/test/data/untrusted-server.crt b/test/mitmproxy/data/untrusted-server.crt
index 62e58601..62e58601 100644
--- a/mitmproxy/test/data/untrusted-server.crt
+++ b/test/mitmproxy/data/untrusted-server.crt
diff --git a/mitmproxy/test/fuzzing/.env b/test/mitmproxy/fuzzing/.env
index 82ae6a8d..82ae6a8d 100644
--- a/mitmproxy/test/fuzzing/.env
+++ b/test/mitmproxy/fuzzing/.env
diff --git a/mitmproxy/test/fuzzing/README b/test/mitmproxy/fuzzing/README
index 2760506f..2760506f 100644
--- a/mitmproxy/test/fuzzing/README
+++ b/test/mitmproxy/fuzzing/README
diff --git a/mitmproxy/test/fuzzing/client_patterns b/test/mitmproxy/fuzzing/client_patterns
index 83457b6f..83457b6f 100644
--- a/mitmproxy/test/fuzzing/client_patterns
+++ b/test/mitmproxy/fuzzing/client_patterns
diff --git a/mitmproxy/test/fuzzing/go_proxy b/test/mitmproxy/fuzzing/go_proxy
index ea29400f..ea29400f 100644
--- a/mitmproxy/test/fuzzing/go_proxy
+++ b/test/mitmproxy/fuzzing/go_proxy
diff --git a/mitmproxy/test/fuzzing/reverse_patterns b/test/mitmproxy/fuzzing/reverse_patterns
index 8d1d76a2..8d1d76a2 100644
--- a/mitmproxy/test/fuzzing/reverse_patterns
+++ b/test/mitmproxy/fuzzing/reverse_patterns
diff --git a/mitmproxy/test/fuzzing/straight_stream b/test/mitmproxy/fuzzing/straight_stream
index 41e2a6e1..41e2a6e1 100644
--- a/mitmproxy/test/fuzzing/straight_stream
+++ b/test/mitmproxy/fuzzing/straight_stream
diff --git a/mitmproxy/test/fuzzing/straight_stream_patterns b/test/mitmproxy/fuzzing/straight_stream_patterns
index 93a066e6..93a066e6 100644
--- a/mitmproxy/test/fuzzing/straight_stream_patterns
+++ b/test/mitmproxy/fuzzing/straight_stream_patterns
diff --git a/mitmproxy/test/fuzzing/straight_stream_ssl b/test/mitmproxy/fuzzing/straight_stream_ssl
index 708ff0b3..708ff0b3 100644
--- a/mitmproxy/test/fuzzing/straight_stream_ssl
+++ b/test/mitmproxy/fuzzing/straight_stream_ssl
diff --git a/mitmproxy/test/mock_urwid.py b/test/mitmproxy/mock_urwid.py
index 191210bf..191210bf 100644
--- a/mitmproxy/test/mock_urwid.py
+++ b/test/mitmproxy/mock_urwid.py
diff --git a/mitmproxy/test/scripts/a.py b/test/mitmproxy/scripts/a.py
index d4272ac8..d4272ac8 100644
--- a/mitmproxy/test/scripts/a.py
+++ b/test/mitmproxy/scripts/a.py
diff --git a/mitmproxy/test/scripts/a_helper.py b/test/mitmproxy/scripts/a_helper.py
index e1f1c649..e1f1c649 100644
--- a/mitmproxy/test/scripts/a_helper.py
+++ b/test/mitmproxy/scripts/a_helper.py
diff --git a/mitmproxy/test/scripts/all.py b/test/mitmproxy/scripts/all.py
index dad2aade..dad2aade 100644
--- a/mitmproxy/test/scripts/all.py
+++ b/test/mitmproxy/scripts/all.py
diff --git a/mitmproxy/test/scripts/concurrent_decorator.py b/test/mitmproxy/scripts/concurrent_decorator.py
index f6feda1d..f6feda1d 100644
--- a/mitmproxy/test/scripts/concurrent_decorator.py
+++ b/test/mitmproxy/scripts/concurrent_decorator.py
diff --git a/mitmproxy/test/scripts/concurrent_decorator_err.py b/test/mitmproxy/scripts/concurrent_decorator_err.py
index 00fd8dad..00fd8dad 100644
--- a/mitmproxy/test/scripts/concurrent_decorator_err.py
+++ b/test/mitmproxy/scripts/concurrent_decorator_err.py
diff --git a/mitmproxy/test/scripts/duplicate_flow.py b/test/mitmproxy/scripts/duplicate_flow.py
index e13af786..e13af786 100644
--- a/mitmproxy/test/scripts/duplicate_flow.py
+++ b/test/mitmproxy/scripts/duplicate_flow.py
diff --git a/mitmproxy/test/scripts/loaderr.py b/test/mitmproxy/scripts/loaderr.py
index 8dc4d56d..8dc4d56d 100644
--- a/mitmproxy/test/scripts/loaderr.py
+++ b/test/mitmproxy/scripts/loaderr.py
diff --git a/mitmproxy/test/scripts/reqerr.py b/test/mitmproxy/scripts/reqerr.py
index e7c503a8..e7c503a8 100644
--- a/mitmproxy/test/scripts/reqerr.py
+++ b/test/mitmproxy/scripts/reqerr.py
diff --git a/mitmproxy/test/scripts/starterr.py b/test/mitmproxy/scripts/starterr.py
index b217bdfe..b217bdfe 100644
--- a/mitmproxy/test/scripts/starterr.py
+++ b/test/mitmproxy/scripts/starterr.py
diff --git a/mitmproxy/test/scripts/stream_modify.py b/test/mitmproxy/scripts/stream_modify.py
index e26d83f1..e26d83f1 100644
--- a/mitmproxy/test/scripts/stream_modify.py
+++ b/test/mitmproxy/scripts/stream_modify.py
diff --git a/mitmproxy/test/scripts/syntaxerr.py b/test/mitmproxy/scripts/syntaxerr.py
index 219d6b84..219d6b84 100644
--- a/mitmproxy/test/scripts/syntaxerr.py
+++ b/test/mitmproxy/scripts/syntaxerr.py
diff --git a/mitmproxy/test/scripts/tcp_stream_modify.py b/test/mitmproxy/scripts/tcp_stream_modify.py
index 93b0d5c8..93b0d5c8 100644
--- a/mitmproxy/test/scripts/tcp_stream_modify.py
+++ b/test/mitmproxy/scripts/tcp_stream_modify.py
diff --git a/mitmproxy/test/scripts/unloaderr.py b/test/mitmproxy/scripts/unloaderr.py
index fba02734..fba02734 100644
--- a/mitmproxy/test/scripts/unloaderr.py
+++ b/test/mitmproxy/scripts/unloaderr.py
diff --git a/mitmproxy/test/test_app.py b/test/mitmproxy/test_app.py
index 577a70a5..577a70a5 100644
--- a/mitmproxy/test/test_app.py
+++ b/test/mitmproxy/test_app.py
diff --git a/mitmproxy/test/test_cmdline.py b/test/mitmproxy/test_cmdline.py
index 9b3317aa..9b3317aa 100644
--- a/mitmproxy/test/test_cmdline.py
+++ b/test/mitmproxy/test_cmdline.py
diff --git a/mitmproxy/test/test_console.py b/test/mitmproxy/test_console.py
index e64ed44a..e64ed44a 100644
--- a/mitmproxy/test/test_console.py
+++ b/test/mitmproxy/test_console.py
diff --git a/mitmproxy/test/test_console_common.py b/test/mitmproxy/test_console_common.py
index deba5f6c..deba5f6c 100644
--- a/mitmproxy/test/test_console_common.py
+++ b/test/mitmproxy/test_console_common.py
diff --git a/mitmproxy/test/test_console_help.py b/test/mitmproxy/test_console_help.py
index f1a71faf..f1a71faf 100644
--- a/mitmproxy/test/test_console_help.py
+++ b/test/mitmproxy/test_console_help.py
diff --git a/mitmproxy/test/test_console_palettes.py b/test/mitmproxy/test_console_palettes.py
index ac33f83d..ac33f83d 100644
--- a/mitmproxy/test/test_console_palettes.py
+++ b/test/mitmproxy/test_console_palettes.py
diff --git a/mitmproxy/test/test_console_pathedit.py b/test/mitmproxy/test_console_pathedit.py
index 940351f5..940351f5 100644
--- a/mitmproxy/test/test_console_pathedit.py
+++ b/test/mitmproxy/test_console_pathedit.py
diff --git a/mitmproxy/test/test_contentview.py b/test/mitmproxy/test_contentview.py
index af80d63a..af80d63a 100644
--- a/mitmproxy/test/test_contentview.py
+++ b/test/mitmproxy/test_contentview.py
diff --git a/mitmproxy/test/test_controller.py b/test/mitmproxy/test_controller.py
index ffc7d433..ffc7d433 100644
--- a/mitmproxy/test/test_controller.py
+++ b/test/mitmproxy/test_controller.py
diff --git a/mitmproxy/test/test_custom_contentview.py b/test/mitmproxy/test_custom_contentview.py
index adc4109b..adc4109b 100644
--- a/mitmproxy/test/test_custom_contentview.py
+++ b/test/mitmproxy/test_custom_contentview.py
diff --git a/mitmproxy/test/test_dump.py b/test/mitmproxy/test_dump.py
index dbd0c653..dbd0c653 100644
--- a/mitmproxy/test/test_dump.py
+++ b/test/mitmproxy/test_dump.py
diff --git a/mitmproxy/test/test_examples.py b/test/mitmproxy/test_examples.py
index bb7c596b..bb7c596b 100644
--- a/mitmproxy/test/test_examples.py
+++ b/test/mitmproxy/test_examples.py
diff --git a/mitmproxy/test/test_filt.py b/test/mitmproxy/test_filt.py
index e6873c7d..e6873c7d 100644
--- a/mitmproxy/test/test_filt.py
+++ b/test/mitmproxy/test_filt.py
diff --git a/mitmproxy/test/test_flow.py b/test/mitmproxy/test_flow.py
index b122489f..b122489f 100644
--- a/mitmproxy/test/test_flow.py
+++ b/test/mitmproxy/test_flow.py
diff --git a/mitmproxy/test/test_flow_export.py b/test/mitmproxy/test_flow_export.py
index e5e9c0a3..e5e9c0a3 100644
--- a/mitmproxy/test/test_flow_export.py
+++ b/test/mitmproxy/test_flow_export.py
diff --git a/mitmproxy/test/test_flow_format_compat.py b/test/mitmproxy/test_flow_format_compat.py
index 232f5473..232f5473 100644
--- a/mitmproxy/test/test_flow_format_compat.py
+++ b/test/mitmproxy/test_flow_format_compat.py
diff --git a/mitmproxy/test/test_fuzzing.py b/test/mitmproxy/test_fuzzing.py
index cec64f58..cec64f58 100644
--- a/mitmproxy/test/test_fuzzing.py
+++ b/test/mitmproxy/test_fuzzing.py
diff --git a/mitmproxy/test/test_platform_pf.py b/test/mitmproxy/test_platform_pf.py
index 8994ee0d..8994ee0d 100644
--- a/mitmproxy/test/test_platform_pf.py
+++ b/test/mitmproxy/test_platform_pf.py
diff --git a/mitmproxy/test/test_protocol_http1.py b/test/mitmproxy/test_protocol_http1.py
index 13e0eabe..13e0eabe 100644
--- a/mitmproxy/test/test_protocol_http1.py
+++ b/test/mitmproxy/test_protocol_http1.py
diff --git a/mitmproxy/test/test_protocol_http2.py b/test/mitmproxy/test_protocol_http2.py
index c2c736af..c2c736af 100644
--- a/mitmproxy/test/test_protocol_http2.py
+++ b/test/mitmproxy/test_protocol_http2.py
diff --git a/mitmproxy/test/test_proxy.py b/test/mitmproxy/test_proxy.py
index 27ae70a8..27ae70a8 100644
--- a/mitmproxy/test/test_proxy.py
+++ b/test/mitmproxy/test_proxy.py
diff --git a/mitmproxy/test/test_script.py b/test/mitmproxy/test_script.py
index f3a6499e..f3a6499e 100644
--- a/mitmproxy/test/test_script.py
+++ b/test/mitmproxy/test_script.py
diff --git a/mitmproxy/test/test_server.py b/test/mitmproxy/test_server.py
index 1b7e6966..1b7e6966 100644
--- a/mitmproxy/test/test_server.py
+++ b/test/mitmproxy/test_server.py
diff --git a/mitmproxy/test/test_utils.py b/test/mitmproxy/test_utils.py
index 17bf3dbf..17bf3dbf 100644
--- a/mitmproxy/test/test_utils.py
+++ b/test/mitmproxy/test_utils.py
diff --git a/mitmproxy/test/tools/1024example b/test/mitmproxy/tools/1024example
index 78af7ed0..78af7ed0 100644
--- a/mitmproxy/test/tools/1024example
+++ b/test/mitmproxy/tools/1024example
diff --git a/mitmproxy/test/tools/ab.exe b/test/mitmproxy/tools/ab.exe
index d68ed0f3..d68ed0f3 100644
--- a/mitmproxy/test/tools/ab.exe
+++ b/test/mitmproxy/tools/ab.exe
diff --git a/mitmproxy/test/tools/bench.py b/test/mitmproxy/tools/bench.py
index 8127d083..8127d083 100644
--- a/mitmproxy/test/tools/bench.py
+++ b/test/mitmproxy/tools/bench.py
diff --git a/mitmproxy/test/tools/benchtool.py b/test/mitmproxy/tools/benchtool.py
index a1d80697..a1d80697 100644
--- a/mitmproxy/test/tools/benchtool.py
+++ b/test/mitmproxy/tools/benchtool.py
diff --git a/mitmproxy/test/tools/getcert b/test/mitmproxy/tools/getcert
index 3bd2bec8..3bd2bec8 100644
--- a/mitmproxy/test/tools/getcert
+++ b/test/mitmproxy/tools/getcert
diff --git a/mitmproxy/test/tools/inspect_dumpfile.py b/test/mitmproxy/tools/inspect_dumpfile.py
index d15e9e8a..d15e9e8a 100644
--- a/mitmproxy/test/tools/inspect_dumpfile.py
+++ b/test/mitmproxy/tools/inspect_dumpfile.py
diff --git a/mitmproxy/test/tools/memoryleak.py b/test/mitmproxy/tools/memoryleak.py
index 259309a6..259309a6 100644
--- a/mitmproxy/test/tools/memoryleak.py
+++ b/test/mitmproxy/tools/memoryleak.py
diff --git a/mitmproxy/test/tools/passive_close.py b/test/mitmproxy/tools/passive_close.py
index 5b1bd451..5b1bd451 100644
--- a/mitmproxy/test/tools/passive_close.py
+++ b/test/mitmproxy/tools/passive_close.py
diff --git a/mitmproxy/test/tools/testpatt b/test/mitmproxy/tools/testpatt
index b41011c0..b41011c0 100644
--- a/mitmproxy/test/tools/testpatt
+++ b/test/mitmproxy/tools/testpatt
diff --git a/mitmproxy/test/tservers.py b/test/mitmproxy/tservers.py
index dbc9f7d0..dbc9f7d0 100644
--- a/mitmproxy/test/tservers.py
+++ b/test/mitmproxy/tservers.py
diff --git a/mitmproxy/test/tutils.py b/test/mitmproxy/tutils.py
index 2ce0884d..2ce0884d 100644
--- a/mitmproxy/test/tutils.py
+++ b/test/mitmproxy/tutils.py
diff --git a/netlib/test/http/__init__.py b/test/netlib/__init__.py
index e69de29b..e69de29b 100644
--- a/netlib/test/http/__init__.py
+++ b/test/netlib/__init__.py
diff --git a/netlib/test/data/clientcert/.gitignore b/test/netlib/data/clientcert/.gitignore
index 07bc53d2..07bc53d2 100644
--- a/netlib/test/data/clientcert/.gitignore
+++ b/test/netlib/data/clientcert/.gitignore
diff --git a/netlib/test/data/clientcert/client.cnf b/test/netlib/data/clientcert/client.cnf
index 5046a944..5046a944 100644
--- a/netlib/test/data/clientcert/client.cnf
+++ b/test/netlib/data/clientcert/client.cnf
diff --git a/netlib/test/data/clientcert/client.pem b/test/netlib/data/clientcert/client.pem
index 4927bca2..4927bca2 100644
--- a/netlib/test/data/clientcert/client.pem
+++ b/test/netlib/data/clientcert/client.pem
diff --git a/netlib/test/data/clientcert/make b/test/netlib/data/clientcert/make
index d1caea81..d1caea81 100755..100644
--- a/netlib/test/data/clientcert/make
+++ b/test/netlib/data/clientcert/make
diff --git a/netlib/test/data/dercert b/test/netlib/data/dercert
index 370252af..370252af 100644
--- a/netlib/test/data/dercert
+++ b/test/netlib/data/dercert
diff --git a/netlib/test/data/dhparam.pem b/test/netlib/data/dhparam.pem
index afb41672..afb41672 100644
--- a/netlib/test/data/dhparam.pem
+++ b/test/netlib/data/dhparam.pem
diff --git a/netlib/test/data/htpasswd b/test/netlib/data/htpasswd
index 54c95b8c..54c95b8c 100644
--- a/netlib/test/data/htpasswd
+++ b/test/netlib/data/htpasswd
diff --git a/netlib/test/data/server.crt b/test/netlib/data/server.crt
index 68f61bac..68f61bac 100644
--- a/netlib/test/data/server.crt
+++ b/test/netlib/data/server.crt
diff --git a/netlib/test/data/server.key b/test/netlib/data/server.key
index b1b658ab..b1b658ab 100644
--- a/netlib/test/data/server.key
+++ b/test/netlib/data/server.key
diff --git a/netlib/test/data/text_cert b/test/netlib/data/text_cert
index 36ca33b9..36ca33b9 100644
--- a/netlib/test/data/text_cert
+++ b/test/netlib/data/text_cert
diff --git a/netlib/test/data/text_cert_2 b/test/netlib/data/text_cert_2
index ffe8faae..ffe8faae 100644
--- a/netlib/test/data/text_cert_2
+++ b/test/netlib/data/text_cert_2
diff --git a/netlib/test/data/text_cert_weird1 b/test/netlib/data/text_cert_weird1
index 72b09dcb..72b09dcb 100644
--- a/netlib/test/data/text_cert_weird1
+++ b/test/netlib/data/text_cert_weird1
diff --git a/netlib/test/data/verificationcerts/9da13359.0 b/test/netlib/data/verificationcerts/9da13359.0
index b22e4d20..b22e4d20 100644
--- a/netlib/test/data/verificationcerts/9da13359.0
+++ b/test/netlib/data/verificationcerts/9da13359.0
diff --git a/netlib/test/data/verificationcerts/generate.py b/test/netlib/data/verificationcerts/generate.py
index 9203abbb..9203abbb 100644
--- a/netlib/test/data/verificationcerts/generate.py
+++ b/test/netlib/data/verificationcerts/generate.py
diff --git a/netlib/test/data/verificationcerts/self-signed.crt b/test/netlib/data/verificationcerts/self-signed.crt
index dce2a7e0..dce2a7e0 100644
--- a/netlib/test/data/verificationcerts/self-signed.crt
+++ b/test/netlib/data/verificationcerts/self-signed.crt
diff --git a/netlib/test/data/verificationcerts/self-signed.key b/test/netlib/data/verificationcerts/self-signed.key
index 71a6ad6a..71a6ad6a 100644
--- a/netlib/test/data/verificationcerts/self-signed.key
+++ b/test/netlib/data/verificationcerts/self-signed.key
diff --git a/netlib/test/data/verificationcerts/trusted-leaf.crt b/test/netlib/data/verificationcerts/trusted-leaf.crt
index 6a92de92..6a92de92 100644
--- a/netlib/test/data/verificationcerts/trusted-leaf.crt
+++ b/test/netlib/data/verificationcerts/trusted-leaf.crt
diff --git a/netlib/test/data/verificationcerts/trusted-leaf.key b/test/netlib/data/verificationcerts/trusted-leaf.key
index 783ebf1c..783ebf1c 100644
--- a/netlib/test/data/verificationcerts/trusted-leaf.key
+++ b/test/netlib/data/verificationcerts/trusted-leaf.key
diff --git a/netlib/test/data/verificationcerts/trusted-root.crt b/test/netlib/data/verificationcerts/trusted-root.crt
index b22e4d20..b22e4d20 100644
--- a/netlib/test/data/verificationcerts/trusted-root.crt
+++ b/test/netlib/data/verificationcerts/trusted-root.crt
diff --git a/netlib/test/data/verificationcerts/trusted-root.key b/test/netlib/data/verificationcerts/trusted-root.key
index 05483f77..05483f77 100644
--- a/netlib/test/data/verificationcerts/trusted-root.key
+++ b/test/netlib/data/verificationcerts/trusted-root.key
diff --git a/netlib/test/data/verificationcerts/trusted-root.srl b/test/netlib/data/verificationcerts/trusted-root.srl
index 4ad962ba..4ad962ba 100644
--- a/netlib/test/data/verificationcerts/trusted-root.srl
+++ b/test/netlib/data/verificationcerts/trusted-root.srl
diff --git a/netlib/test/http/http1/__init__.py b/test/netlib/http/__init__.py
index e69de29b..e69de29b 100644
--- a/netlib/test/http/http1/__init__.py
+++ b/test/netlib/http/__init__.py
diff --git a/netlib/test/http/http2/__init__.py b/test/netlib/http/http1/__init__.py
index e69de29b..e69de29b 100644
--- a/netlib/test/http/http2/__init__.py
+++ b/test/netlib/http/http1/__init__.py
diff --git a/netlib/test/http/http1/test_assemble.py b/test/netlib/http/http1/test_assemble.py
index 31a62438..31a62438 100644
--- a/netlib/test/http/http1/test_assemble.py
+++ b/test/netlib/http/http1/test_assemble.py
diff --git a/netlib/test/http/http1/test_read.py b/test/netlib/http/http1/test_read.py
index 90234070..90234070 100644
--- a/netlib/test/http/http1/test_read.py
+++ b/test/netlib/http/http1/test_read.py
diff --git a/netlib/test/websockets/__init__.py b/test/netlib/http/http2/__init__.py
index e69de29b..e69de29b 100644
--- a/netlib/test/websockets/__init__.py
+++ b/test/netlib/http/http2/__init__.py
diff --git a/netlib/test/http/http2/test_connections.py b/test/netlib/http/http2/test_connections.py
index a115fc7c..a115fc7c 100644
--- a/netlib/test/http/http2/test_connections.py
+++ b/test/netlib/http/http2/test_connections.py
diff --git a/netlib/test/http/test_authentication.py b/test/netlib/http/test_authentication.py
index 1df7cd9c..1df7cd9c 100644
--- a/netlib/test/http/test_authentication.py
+++ b/test/netlib/http/test_authentication.py
diff --git a/netlib/test/http/test_cookies.py b/test/netlib/http/test_cookies.py
index 34bb64f2..34bb64f2 100644
--- a/netlib/test/http/test_cookies.py
+++ b/test/netlib/http/test_cookies.py
diff --git a/netlib/test/http/test_headers.py b/test/netlib/http/test_headers.py
index d50fee3e..d50fee3e 100644
--- a/netlib/test/http/test_headers.py
+++ b/test/netlib/http/test_headers.py
diff --git a/netlib/test/http/test_message.py b/test/netlib/http/test_message.py
index 4b1f4630..4b1f4630 100644
--- a/netlib/test/http/test_message.py
+++ b/test/netlib/http/test_message.py
diff --git a/netlib/test/http/test_request.py b/test/netlib/http/test_request.py
index 900b2cd1..900b2cd1 100644
--- a/netlib/test/http/test_request.py
+++ b/test/netlib/http/test_request.py
diff --git a/netlib/test/http/test_response.py b/test/netlib/http/test_response.py
index 14588000..14588000 100644
--- a/netlib/test/http/test_response.py
+++ b/test/netlib/http/test_response.py
diff --git a/netlib/test/http/test_status_codes.py b/test/netlib/http/test_status_codes.py
index 9fea6b70..9fea6b70 100644
--- a/netlib/test/http/test_status_codes.py
+++ b/test/netlib/http/test_status_codes.py
diff --git a/netlib/test/http/test_user_agents.py b/test/netlib/http/test_user_agents.py
index 0bf1bba7..0bf1bba7 100644
--- a/netlib/test/http/test_user_agents.py
+++ b/test/netlib/http/test_user_agents.py
diff --git a/netlib/test/test_certutils.py b/test/netlib/test_certutils.py
index 027dcc93..027dcc93 100644
--- a/netlib/test/test_certutils.py
+++ b/test/netlib/test_certutils.py
diff --git a/netlib/test/test_encoding.py b/test/netlib/test_encoding.py
index 0ff1aad1..0ff1aad1 100644
--- a/netlib/test/test_encoding.py
+++ b/test/netlib/test_encoding.py
diff --git a/netlib/test/test_imports.py b/test/netlib/test_imports.py
index b88ef26d..b88ef26d 100644
--- a/netlib/test/test_imports.py
+++ b/test/netlib/test_imports.py
diff --git a/netlib/test/test_odict.py b/test/netlib/test_odict.py
index f0985ef6..f0985ef6 100644
--- a/netlib/test/test_odict.py
+++ b/test/netlib/test_odict.py
diff --git a/netlib/test/test_socks.py b/test/netlib/test_socks.py
index d95dee41..d95dee41 100644
--- a/netlib/test/test_socks.py
+++ b/test/netlib/test_socks.py
diff --git a/netlib/test/test_tcp.py b/test/netlib/test_tcp.py
index 2b091ef0..2b091ef0 100644
--- a/netlib/test/test_tcp.py
+++ b/test/netlib/test_tcp.py
diff --git a/netlib/test/test_utils.py b/test/netlib/test_utils.py
index b096e5bc..b096e5bc 100644
--- a/netlib/test/test_utils.py
+++ b/test/netlib/test_utils.py
diff --git a/netlib/test/test_version_check.py b/test/netlib/test_version_check.py
index ec2396fe..ec2396fe 100644
--- a/netlib/test/test_version_check.py
+++ b/test/netlib/test_version_check.py
diff --git a/netlib/test/test_wsgi.py b/test/netlib/test_wsgi.py
index 8c782b27..8c782b27 100644
--- a/netlib/test/test_wsgi.py
+++ b/test/netlib/test_wsgi.py
diff --git a/netlib/test/tools/getcertnames b/test/netlib/tools/getcertnames
index e33619f7..e33619f7 100644
--- a/netlib/test/tools/getcertnames
+++ b/test/netlib/tools/getcertnames
diff --git a/test/netlib/websockets/__init__.py b/test/netlib/websockets/__init__.py
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/test/netlib/websockets/__init__.py
diff --git a/netlib/test/websockets/test_websockets.py b/test/netlib/websockets/test_websockets.py
index d53f0d83..d53f0d83 100644
--- a/netlib/test/websockets/test_websockets.py
+++ b/test/netlib/websockets/test_websockets.py
diff --git a/pathod/test/data/clientcert/.gitignore b/test/pathod/data/clientcert/.gitignore
index 07bc53d2..07bc53d2 100644
--- a/pathod/test/data/clientcert/.gitignore
+++ b/test/pathod/data/clientcert/.gitignore
diff --git a/pathod/test/data/clientcert/client.cnf b/test/pathod/data/clientcert/client.cnf
index 5046a944..5046a944 100644
--- a/pathod/test/data/clientcert/client.cnf
+++ b/test/pathod/data/clientcert/client.cnf
diff --git a/pathod/test/data/clientcert/client.pem b/test/pathod/data/clientcert/client.pem
index 4927bca2..4927bca2 100644
--- a/pathod/test/data/clientcert/client.pem
+++ b/test/pathod/data/clientcert/client.pem
diff --git a/pathod/test/data/clientcert/make b/test/pathod/data/clientcert/make
index d1caea81..d1caea81 100755..100644
--- a/pathod/test/data/clientcert/make
+++ b/test/pathod/data/clientcert/make
diff --git a/pathod/test/data/file b/test/pathod/data/file
index 26918572..26918572 100644
--- a/pathod/test/data/file
+++ b/test/pathod/data/file
diff --git a/pathod/test/data/request b/test/pathod/data/request
index c4c90e76..c4c90e76 100644
--- a/pathod/test/data/request
+++ b/test/pathod/data/request
diff --git a/pathod/test/data/response b/test/pathod/data/response
index 8f897c85..8f897c85 100644
--- a/pathod/test/data/response
+++ b/test/pathod/data/response
diff --git a/pathod/test/data/testkey.pem b/test/pathod/data/testkey.pem
index b804bd4c..b804bd4c 100644
--- a/pathod/test/data/testkey.pem
+++ b/test/pathod/data/testkey.pem
diff --git a/pathod/test/scripts/generate.sh b/test/pathod/scripts/generate.sh
index eec3077d..eec3077d 100755..100644
--- a/pathod/test/scripts/generate.sh
+++ b/test/pathod/scripts/generate.sh
diff --git a/pathod/test/scripts/openssl.cnf b/test/pathod/scripts/openssl.cnf
index 5c890354..5c890354 100644
--- a/pathod/test/scripts/openssl.cnf
+++ b/test/pathod/scripts/openssl.cnf
diff --git a/pathod/test/test_app.py b/test/pathod/test_app.py
index 4536db8e..4536db8e 100644
--- a/pathod/test/test_app.py
+++ b/test/pathod/test_app.py
diff --git a/pathod/test/test_language_actions.py b/test/pathod/test_language_actions.py
index 755f0d85..755f0d85 100644
--- a/pathod/test/test_language_actions.py
+++ b/test/pathod/test_language_actions.py
diff --git a/pathod/test/test_language_base.py b/test/pathod/test_language_base.py
index b18ee5b2..b18ee5b2 100644
--- a/pathod/test/test_language_base.py
+++ b/test/pathod/test_language_base.py
diff --git a/pathod/test/test_language_generators.py b/test/pathod/test_language_generators.py
index 945560c3..945560c3 100644
--- a/pathod/test/test_language_generators.py
+++ b/test/pathod/test_language_generators.py
diff --git a/pathod/test/test_language_http.py b/test/pathod/test_language_http.py
index 26bb6a45..26bb6a45 100644
--- a/pathod/test/test_language_http.py
+++ b/test/pathod/test_language_http.py
diff --git a/pathod/test/test_language_http2.py b/test/pathod/test_language_http2.py
index 9be49452..9be49452 100644
--- a/pathod/test/test_language_http2.py
+++ b/test/pathod/test_language_http2.py
diff --git a/pathod/test/test_language_websocket.py b/test/pathod/test_language_websocket.py
index d98fd33e..d98fd33e 100644
--- a/pathod/test/test_language_websocket.py
+++ b/test/pathod/test_language_websocket.py
diff --git a/pathod/test/test_language_writer.py b/test/pathod/test_language_writer.py
index 1a532903..1a532903 100644
--- a/pathod/test/test_language_writer.py
+++ b/test/pathod/test_language_writer.py
diff --git a/pathod/test/test_log.py b/test/pathod/test_log.py
index 8f38c040..8f38c040 100644
--- a/pathod/test/test_log.py
+++ b/test/pathod/test_log.py
diff --git a/pathod/test/test_pathoc.py b/test/pathod/test_pathoc.py
index 62696a64..62696a64 100644
--- a/pathod/test/test_pathoc.py
+++ b/test/pathod/test_pathoc.py
diff --git a/pathod/test/test_pathoc_cmdline.py b/test/pathod/test_pathoc_cmdline.py
index 74dfef57..74dfef57 100644
--- a/pathod/test/test_pathoc_cmdline.py
+++ b/test/pathod/test_pathoc_cmdline.py
diff --git a/pathod/test/test_pathod.py b/test/pathod/test_pathod.py
index 98da7d28..98da7d28 100644
--- a/pathod/test/test_pathod.py
+++ b/test/pathod/test_pathod.py
diff --git a/pathod/test/test_pathod_cmdline.py b/test/pathod/test_pathod_cmdline.py
index 829c4b32..829c4b32 100644
--- a/pathod/test/test_pathod_cmdline.py
+++ b/test/pathod/test_pathod_cmdline.py
diff --git a/pathod/test/test_test.py b/test/pathod/test_test.py
index bd92d864..bd92d864 100644
--- a/pathod/test/test_test.py
+++ b/test/pathod/test_test.py
diff --git a/pathod/test/test_utils.py b/test/pathod/test_utils.py
index 7d24e9e4..7d24e9e4 100644
--- a/pathod/test/test_utils.py
+++ b/test/pathod/test_utils.py
diff --git a/pathod/test/tutils.py b/test/pathod/tutils.py
index 664cdd52..664cdd52 100644
--- a/pathod/test/tutils.py
+++ b/test/pathod/tutils.py