diff options
| author | Thomas Kriechbaumer <Kriechi@users.noreply.github.com> | 2019-01-26 14:57:41 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-26 14:57:41 +0100 |
| commit | 67aa1b63f9c520814af75eb3151d3c50a4d17c1d (patch) | |
| tree | fb63a349c846eb74bab0fbe5e5329923b74238b0 /test | |
| parent | 139a3859005c0302ec08535d4b311dd5609d719d (diff) | |
| parent | cc33f40f29dcd250e2dc3df77412fdec91f2d4eb (diff) | |
| download | mitmproxy-67aa1b63f9c520814af75eb3151d3c50a4d17c1d.tar.gz mitmproxy-67aa1b63f9c520814af75eb3151d3c50a4d17c1d.tar.bz2 mitmproxy-67aa1b63f9c520814af75eb3151d3c50a4d17c1d.zip | |
Merge pull request #3437 from yan12125/fix-tests-on-mojave
Fix a failing test on macOS Mojave
Diffstat (limited to 'test')
| -rw-r--r-- | test/mitmproxy/test_proxy.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/test/mitmproxy/test_proxy.py b/test/mitmproxy/test_proxy.py index 00086c4b..c8cf6c33 100644 --- a/test/mitmproxy/test_proxy.py +++ b/test/mitmproxy/test_proxy.py @@ -1,4 +1,5 @@ import argparse +import platform from unittest import mock import pytest @@ -52,8 +53,11 @@ class TestProcessProxyOptions: class TestProxyServer: @skip_windows + @pytest.mark.skipif(platform.mac_ver()[0].split('.')[:2] == ['10', '14'], + reason='Skipping due to macOS Mojave') def test_err(self): - # binding to 0.0.0.0:1 works without special permissions on Windows + # binding to 0.0.0.0:1 works without special permissions on Windows and + # macOS Mojave conf = ProxyConfig(options.Options(listen_port=1)) with pytest.raises(Exception, match="Error starting proxy server"): ProxyServer(conf) |