aboutsummaryrefslogtreecommitdiffstats
path: root/testing/mitmproxy/test-proxy.patch
diff options
context:
space:
mode:
Diffstat (limited to 'testing/mitmproxy/test-proxy.patch')
-rw-r--r--testing/mitmproxy/test-proxy.patch16
1 files changed, 0 insertions, 16 deletions
diff --git a/testing/mitmproxy/test-proxy.patch b/testing/mitmproxy/test-proxy.patch
deleted file mode 100644
index 0a562085e8d..00000000000
--- a/testing/mitmproxy/test-proxy.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Upstream: No
-Reason: Skip test which fails when user can bind to privileged ports,
-see: https://github.com/mitmproxy/mitmproxy/issues/2730#issuecomment-354542118
-
-diff --git a/test/mitmproxy/test_proxy.py b/test/mitmproxy/test_proxy.py
-index 6c82359b9..eb5f13d7e 100644
---- a/test/mitmproxy/test_proxy.py
-+++ b/test/mitmproxy/test_proxy.py
-@@ -52,6 +53,7 @@ class TestProxyServer:
-
- @skip_windows
- @pytest.mark.skipif(platform.system() != "Linux", reason="Linux-only")
-+ @pytest.mark.skip(reason="CI can bind to privileged ports which makes this test fail")
- def test_err(self):
- # binding to 0.0.0.0:1 works without special permissions on Windows and macOS Mojave+
- conf = ProxyConfig(options.Options(listen_port=1))