diff --git a/test/mitmproxy/tools/1024example b/test/helper_tools/1024example similarity index 100% rename from test/mitmproxy/tools/1024example rename to test/helper_tools/1024example diff --git a/test/mitmproxy/tools/ab.exe b/test/helper_tools/ab.exe similarity index 100% rename from test/mitmproxy/tools/ab.exe rename to test/helper_tools/ab.exe diff --git a/test/mitmproxy/tools/bench.py b/test/helper_tools/bench.py similarity index 100% rename from test/mitmproxy/tools/bench.py rename to test/helper_tools/bench.py diff --git a/test/mitmproxy/tools/benchtool.py b/test/helper_tools/benchtool.py similarity index 100% rename from test/mitmproxy/tools/benchtool.py rename to test/helper_tools/benchtool.py diff --git a/test/mitmproxy/addons/dumperview.py b/test/helper_tools/dumperview.py similarity index 100% rename from test/mitmproxy/addons/dumperview.py rename to test/helper_tools/dumperview.py diff --git a/test/mitmproxy/tools/getcert b/test/helper_tools/getcert similarity index 100% rename from test/mitmproxy/tools/getcert rename to test/helper_tools/getcert diff --git a/test/mitmproxy/tools/inspect_dumpfile.py b/test/helper_tools/inspect_dumpfile.py similarity index 100% rename from test/mitmproxy/tools/inspect_dumpfile.py rename to test/helper_tools/inspect_dumpfile.py diff --git a/test/mitmproxy/tools/memoryleak.py b/test/helper_tools/memoryleak.py similarity index 100% rename from test/mitmproxy/tools/memoryleak.py rename to test/helper_tools/memoryleak.py diff --git a/test/mitmproxy/tools/passive_close.py b/test/helper_tools/passive_close.py similarity index 100% rename from test/mitmproxy/tools/passive_close.py rename to test/helper_tools/passive_close.py diff --git a/test/mitmproxy/tools/testpatt b/test/helper_tools/testpatt similarity index 100% rename from test/mitmproxy/tools/testpatt rename to test/helper_tools/testpatt diff --git a/test/mitmproxy/addons/onboardingapp/test_app.py b/test/mitmproxy/addons/onboardingapp/test_app.py new file mode 100644 index 00000000..777ab4dd --- /dev/null +++ b/test/mitmproxy/addons/onboardingapp/test_app.py @@ -0,0 +1 @@ +# TODO: write tests diff --git a/test/mitmproxy/addons/test_eventstore.py b/test/mitmproxy/addons/test_eventstore.py new file mode 100644 index 00000000..777ab4dd --- /dev/null +++ b/test/mitmproxy/addons/test_eventstore.py @@ -0,0 +1 @@ +# TODO: write tests diff --git a/test/mitmproxy/contentviews/test_image_parser.py b/test/mitmproxy/contentviews/image/test_image_parser.py similarity index 100% rename from test/mitmproxy/contentviews/test_image_parser.py rename to test/mitmproxy/contentviews/image/test_image_parser.py diff --git a/test/mitmproxy/contentviews/test_image.py b/test/mitmproxy/contentviews/image/test_view.py similarity index 100% rename from test/mitmproxy/contentviews/test_image.py rename to test/mitmproxy/contentviews/image/test_view.py diff --git a/test/mitmproxy/contentviews/test_base.py b/test/mitmproxy/contentviews/test_base.py new file mode 100644 index 00000000..777ab4dd --- /dev/null +++ b/test/mitmproxy/contentviews/test_base.py @@ -0,0 +1 @@ +# TODO: write tests diff --git a/test/mitmproxy/contentviews/test_wbxml.py b/test/mitmproxy/contentviews/test_wbxml.py new file mode 100644 index 00000000..777ab4dd --- /dev/null +++ b/test/mitmproxy/contentviews/test_wbxml.py @@ -0,0 +1 @@ +# TODO: write tests diff --git a/test/mitmproxy/test_contrib_tnetstring.py b/test/mitmproxy/contrib/test_tnetstring.py similarity index 100% rename from test/mitmproxy/test_contrib_tnetstring.py rename to test/mitmproxy/contrib/test_tnetstring.py diff --git a/test/mitmproxy/mock_urwid.py b/test/mitmproxy/mock_urwid.py deleted file mode 100644 index 9cc41abc..00000000 --- a/test/mitmproxy/mock_urwid.py +++ /dev/null @@ -1,11 +0,0 @@ -import os -import sys -from unittest import mock - -if os.name == "nt": - m = mock.Mock() - m.__version__ = "1.1.1" - m.Widget = mock.Mock - m.WidgetWrap = mock.Mock - sys.modules['urwid'] = m - sys.modules['urwid.util'] = mock.Mock() diff --git a/test/mitmproxy/test_platform_pf.py b/test/mitmproxy/platform/test_pf.py similarity index 100% rename from test/mitmproxy/test_platform_pf.py rename to test/mitmproxy/platform/test_pf.py diff --git a/test/mitmproxy/proxy/modes/test_http_proxy.py b/test/mitmproxy/proxy/modes/test_http_proxy.py new file mode 100644 index 00000000..777ab4dd --- /dev/null +++ b/test/mitmproxy/proxy/modes/test_http_proxy.py @@ -0,0 +1 @@ +# TODO: write tests diff --git a/test/mitmproxy/proxy/modes/test_reverse_proxy.py b/test/mitmproxy/proxy/modes/test_reverse_proxy.py new file mode 100644 index 00000000..777ab4dd --- /dev/null +++ b/test/mitmproxy/proxy/modes/test_reverse_proxy.py @@ -0,0 +1 @@ +# TODO: write tests diff --git a/test/mitmproxy/proxy/modes/test_socks_proxy.py b/test/mitmproxy/proxy/modes/test_socks_proxy.py new file mode 100644 index 00000000..777ab4dd --- /dev/null +++ b/test/mitmproxy/proxy/modes/test_socks_proxy.py @@ -0,0 +1 @@ +# TODO: write tests diff --git a/test/mitmproxy/proxy/modes/test_transparent_proxy.py b/test/mitmproxy/proxy/modes/test_transparent_proxy.py new file mode 100644 index 00000000..777ab4dd --- /dev/null +++ b/test/mitmproxy/proxy/modes/test_transparent_proxy.py @@ -0,0 +1 @@ +# TODO: write tests diff --git a/test/mitmproxy/proxy/protocol/test_base.py b/test/mitmproxy/proxy/protocol/test_base.py new file mode 100644 index 00000000..777ab4dd --- /dev/null +++ b/test/mitmproxy/proxy/protocol/test_base.py @@ -0,0 +1 @@ +# TODO: write tests diff --git a/test/mitmproxy/proxy/protocol/test_http.py b/test/mitmproxy/proxy/protocol/test_http.py new file mode 100644 index 00000000..777ab4dd --- /dev/null +++ b/test/mitmproxy/proxy/protocol/test_http.py @@ -0,0 +1 @@ +# TODO: write tests diff --git a/test/mitmproxy/protocol/test_http1.py b/test/mitmproxy/proxy/protocol/test_http1.py similarity index 100% rename from test/mitmproxy/protocol/test_http1.py rename to test/mitmproxy/proxy/protocol/test_http1.py diff --git a/test/mitmproxy/protocol/test_http2.py b/test/mitmproxy/proxy/protocol/test_http2.py similarity index 100% rename from test/mitmproxy/protocol/test_http2.py rename to test/mitmproxy/proxy/protocol/test_http2.py diff --git a/test/mitmproxy/proxy/protocol/test_http_replay.py b/test/mitmproxy/proxy/protocol/test_http_replay.py new file mode 100644 index 00000000..777ab4dd --- /dev/null +++ b/test/mitmproxy/proxy/protocol/test_http_replay.py @@ -0,0 +1 @@ +# TODO: write tests diff --git a/test/mitmproxy/proxy/protocol/test_rawtcp.py b/test/mitmproxy/proxy/protocol/test_rawtcp.py new file mode 100644 index 00000000..777ab4dd --- /dev/null +++ b/test/mitmproxy/proxy/protocol/test_rawtcp.py @@ -0,0 +1 @@ +# TODO: write tests diff --git a/test/mitmproxy/protocol/test_tls.py b/test/mitmproxy/proxy/protocol/test_tls.py similarity index 100% rename from test/mitmproxy/protocol/test_tls.py rename to test/mitmproxy/proxy/protocol/test_tls.py diff --git a/test/mitmproxy/protocol/test_websocket.py b/test/mitmproxy/proxy/protocol/test_websocket.py similarity index 100% rename from test/mitmproxy/protocol/test_websocket.py rename to test/mitmproxy/proxy/protocol/test_websocket.py diff --git a/test/mitmproxy/test_proxy_config.py b/test/mitmproxy/proxy/test_config.py similarity index 100% rename from test/mitmproxy/test_proxy_config.py rename to test/mitmproxy/proxy/test_config.py diff --git a/test/mitmproxy/proxy/test_root_context.py b/test/mitmproxy/proxy/test_root_context.py new file mode 100644 index 00000000..777ab4dd --- /dev/null +++ b/test/mitmproxy/proxy/test_root_context.py @@ -0,0 +1 @@ +# TODO: write tests diff --git a/test/mitmproxy/test_server.py b/test/mitmproxy/proxy/test_server.py similarity index 100% rename from test/mitmproxy/test_server.py rename to test/mitmproxy/proxy/test_server.py diff --git a/test/mitmproxy/test_connections.py b/test/mitmproxy/test_connections.py new file mode 100644 index 00000000..777ab4dd --- /dev/null +++ b/test/mitmproxy/test_connections.py @@ -0,0 +1 @@ +# TODO: write tests diff --git a/test/mitmproxy/test_ctx.py b/test/mitmproxy/test_ctx.py new file mode 100644 index 00000000..777ab4dd --- /dev/null +++ b/test/mitmproxy/test_ctx.py @@ -0,0 +1 @@ +# TODO: write tests diff --git a/test/mitmproxy/test_exceptions.py b/test/mitmproxy/test_exceptions.py new file mode 100644 index 00000000..777ab4dd --- /dev/null +++ b/test/mitmproxy/test_exceptions.py @@ -0,0 +1 @@ +# TODO: write tests diff --git a/test/mitmproxy/test_flow_export.py b/test/mitmproxy/test_export.py similarity index 100% rename from test/mitmproxy/test_flow_export.py rename to test/mitmproxy/test_export.py diff --git a/test/mitmproxy/test_http.py b/test/mitmproxy/test_http.py new file mode 100644 index 00000000..777ab4dd --- /dev/null +++ b/test/mitmproxy/test_http.py @@ -0,0 +1 @@ +# TODO: write tests diff --git a/test/mitmproxy/test_io.py b/test/mitmproxy/test_io.py new file mode 100644 index 00000000..777ab4dd --- /dev/null +++ b/test/mitmproxy/test_io.py @@ -0,0 +1 @@ +# TODO: write tests diff --git a/test/mitmproxy/test_flow_format_compat.py b/test/mitmproxy/test_io_compat.py similarity index 100% rename from test/mitmproxy/test_flow_format_compat.py rename to test/mitmproxy/test_io_compat.py diff --git a/test/mitmproxy/test_log.py b/test/mitmproxy/test_log.py new file mode 100644 index 00000000..777ab4dd --- /dev/null +++ b/test/mitmproxy/test_log.py @@ -0,0 +1 @@ +# TODO: write tests diff --git a/test/mitmproxy/test_master.py b/test/mitmproxy/test_master.py new file mode 100644 index 00000000..777ab4dd --- /dev/null +++ b/test/mitmproxy/test_master.py @@ -0,0 +1 @@ +# TODO: write tests diff --git a/test/mitmproxy/test_options.py b/test/mitmproxy/test_options.py new file mode 100644 index 00000000..777ab4dd --- /dev/null +++ b/test/mitmproxy/test_options.py @@ -0,0 +1 @@ +# TODO: write tests diff --git a/test/mitmproxy/test_tcp.py b/test/mitmproxy/test_tcp.py new file mode 100644 index 00000000..777ab4dd --- /dev/null +++ b/test/mitmproxy/test_tcp.py @@ -0,0 +1 @@ +# TODO: write tests diff --git a/test/mitmproxy/test_websocket.py b/test/mitmproxy/test_websocket.py new file mode 100644 index 00000000..777ab4dd --- /dev/null +++ b/test/mitmproxy/test_websocket.py @@ -0,0 +1 @@ +# TODO: write tests diff --git a/test/mitmproxy/console/__init__.py b/test/mitmproxy/tools/console/__init__.py similarity index 100% rename from test/mitmproxy/console/__init__.py rename to test/mitmproxy/tools/console/__init__.py diff --git a/test/mitmproxy/console/test_common.py b/test/mitmproxy/tools/console/test_common.py similarity index 100% rename from test/mitmproxy/console/test_common.py rename to test/mitmproxy/tools/console/test_common.py diff --git a/test/mitmproxy/console/test_help.py b/test/mitmproxy/tools/console/test_help.py similarity index 100% rename from test/mitmproxy/console/test_help.py rename to test/mitmproxy/tools/console/test_help.py diff --git a/test/mitmproxy/console/test_master.py b/test/mitmproxy/tools/console/test_master.py similarity index 100% rename from test/mitmproxy/console/test_master.py rename to test/mitmproxy/tools/console/test_master.py diff --git a/test/mitmproxy/console/test_palettes.py b/test/mitmproxy/tools/console/test_palettes.py similarity index 100% rename from test/mitmproxy/console/test_palettes.py rename to test/mitmproxy/tools/console/test_palettes.py diff --git a/test/mitmproxy/console/test_pathedit.py b/test/mitmproxy/tools/console/test_pathedit.py similarity index 100% rename from test/mitmproxy/console/test_pathedit.py rename to test/mitmproxy/tools/console/test_pathedit.py diff --git a/test/mitmproxy/test_cmdline.py b/test/mitmproxy/tools/test_cmdline.py similarity index 100% rename from test/mitmproxy/test_cmdline.py rename to test/mitmproxy/tools/test_cmdline.py diff --git a/test/mitmproxy/test_tools_dump.py b/test/mitmproxy/tools/test_dump.py similarity index 100% rename from test/mitmproxy/test_tools_dump.py rename to test/mitmproxy/tools/test_dump.py diff --git a/test/mitmproxy/test_web_app.py b/test/mitmproxy/tools/web/test_app.py similarity index 100% rename from test/mitmproxy/test_web_app.py rename to test/mitmproxy/tools/web/test_app.py diff --git a/test/mitmproxy/test_web_master.py b/test/mitmproxy/tools/web/test_master.py similarity index 100% rename from test/mitmproxy/test_web_master.py rename to test/mitmproxy/tools/web/test_master.py diff --git a/test/mitmproxy/utils/test_bits.py b/test/mitmproxy/utils/test_bits.py new file mode 100644 index 00000000..777ab4dd --- /dev/null +++ b/test/mitmproxy/utils/test_bits.py @@ -0,0 +1 @@ +# TODO: write tests diff --git a/test/pathod/test_language_actions.py b/test/pathod/language/test_actions.py similarity index 100% rename from test/pathod/test_language_actions.py rename to test/pathod/language/test_actions.py diff --git a/test/pathod/test_language_base.py b/test/pathod/language/test_base.py similarity index 100% rename from test/pathod/test_language_base.py rename to test/pathod/language/test_base.py diff --git a/test/pathod/language/test_exceptions.py b/test/pathod/language/test_exceptions.py new file mode 100644 index 00000000..777ab4dd --- /dev/null +++ b/test/pathod/language/test_exceptions.py @@ -0,0 +1 @@ +# TODO: write tests diff --git a/test/pathod/test_language_generators.py b/test/pathod/language/test_generators.py similarity index 100% rename from test/pathod/test_language_generators.py rename to test/pathod/language/test_generators.py diff --git a/test/pathod/test_language_http.py b/test/pathod/language/test_http.py similarity index 100% rename from test/pathod/test_language_http.py rename to test/pathod/language/test_http.py diff --git a/test/pathod/test_language_http2.py b/test/pathod/language/test_http2.py similarity index 100% rename from test/pathod/test_language_http2.py rename to test/pathod/language/test_http2.py diff --git a/test/pathod/language/test_message.py b/test/pathod/language/test_message.py new file mode 100644 index 00000000..777ab4dd --- /dev/null +++ b/test/pathod/language/test_message.py @@ -0,0 +1 @@ +# TODO: write tests diff --git a/test/pathod/test_language_websocket.py b/test/pathod/language/test_websockets.py similarity index 100% rename from test/pathod/test_language_websocket.py rename to test/pathod/language/test_websockets.py diff --git a/test/pathod/test_language_writer.py b/test/pathod/language/test_writer.py similarity index 100% rename from test/pathod/test_language_writer.py rename to test/pathod/language/test_writer.py diff --git a/test/pathod/protocols/test_http.py b/test/pathod/protocols/test_http.py new file mode 100644 index 00000000..777ab4dd --- /dev/null +++ b/test/pathod/protocols/test_http.py @@ -0,0 +1 @@ +# TODO: write tests diff --git a/test/pathod/test_protocols_http2.py b/test/pathod/protocols/test_http2.py similarity index 100% rename from test/pathod/test_protocols_http2.py rename to test/pathod/protocols/test_http2.py diff --git a/test/pathod/protocols/test_websockets.py b/test/pathod/protocols/test_websockets.py new file mode 100644 index 00000000..777ab4dd --- /dev/null +++ b/test/pathod/protocols/test_websockets.py @@ -0,0 +1 @@ +# TODO: write tests