aboutsummaryrefslogtreecommitdiffstats
path: root/test/test_platform_pf.py
diff options
context:
space:
mode:
authorJim Shaver <dcypherd@gmail.com>2015-05-31 01:21:44 -0400
committerJim Shaver <dcypherd@gmail.com>2015-05-31 01:21:44 -0400
commitb51363b3ca43f6572acb673186e6ae78a1f48434 (patch)
treea7488b32871c142141a813dc6ff2ede172672c31 /test/test_platform_pf.py
parent4fe2c069cca07aadf983f54e18dac4de492d5d69 (diff)
parent06fba18106a8f759ec6f08453e86772a170c653b (diff)
downloadmitmproxy-b51363b3ca43f6572acb673186e6ae78a1f48434.tar.gz
mitmproxy-b51363b3ca43f6572acb673186e6ae78a1f48434.tar.bz2
mitmproxy-b51363b3ca43f6572acb673186e6ae78a1f48434.zip
Merge remote-tracking branch 'upstream/master' into print-bracket-fix
Conflicts: examples/har_extractor.py examples/nonblocking.py examples/read_dumpfile libmproxy/web/app.py
Diffstat (limited to 'test/test_platform_pf.py')
-rw-r--r--test/test_platform_pf.py21
1 files changed, 16 insertions, 5 deletions
diff --git a/test/test_platform_pf.py b/test/test_platform_pf.py
index 2c4870f9..3250b035 100644
--- a/test/test_platform_pf.py
+++ b/test/test_platform_pf.py
@@ -1,4 +1,5 @@
-import tutils, sys
+import tutils
+import sys
from libmproxy.platform import pf
@@ -6,10 +7,20 @@ class TestLookup:
def test_simple(self):
if sys.platform == "freebsd10":
p = tutils.test_data.path("data/pf02")
- d = open(p,"rb").read()
+ d = open(p, "rb").read()
else:
p = tutils.test_data.path("data/pf01")
- d = open(p,"rb").read()
+ d = open(p, "rb").read()
assert pf.lookup("192.168.1.111", 40000, d) == ("5.5.5.5", 80)
- tutils.raises("Could not resolve original destination", pf.lookup, "192.168.1.112", 40000, d)
- tutils.raises("Could not resolve original destination", pf.lookup, "192.168.1.111", 40001, d)
+ tutils.raises(
+ "Could not resolve original destination",
+ pf.lookup,
+ "192.168.1.112",
+ 40000,
+ d)
+ tutils.raises(
+ "Could not resolve original destination",
+ pf.lookup,
+ "192.168.1.111",
+ 40001,
+ d)