aboutsummaryrefslogtreecommitdiffstats
path: root/test/test_utils.py
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2014-06-25 20:31:10 +0200
committerMaximilian Hils <git@maximilianhils.com>2014-06-25 20:31:10 +0200
commitdc3d3e5f0a8c4de734187c39888af5fbdb63d8a0 (patch)
tree5fad8c119d798c679e3cd68ae7fa6c3c7e3ba9aa /test/test_utils.py
parent217660f5db8f91fa351c188e1e61903e9f54e94d (diff)
downloadmitmproxy-dc3d3e5f0a8c4de734187c39888af5fbdb63d8a0.tar.gz
mitmproxy-dc3d3e5f0a8c4de734187c39888af5fbdb63d8a0.tar.bz2
mitmproxy-dc3d3e5f0a8c4de734187c39888af5fbdb63d8a0.zip
add inet_ntop/inet_pton functions
Diffstat (limited to 'test/test_utils.py')
-rw-r--r--test/test_utils.py19
1 files changed, 18 insertions, 1 deletions
diff --git a/test/test_utils.py b/test/test_utils.py
index 61820a81..a9a48cd0 100644
--- a/test/test_utils.py
+++ b/test/test_utils.py
@@ -1,5 +1,5 @@
from netlib import utils
-
+import socket
def test_hexdump():
assert utils.hexdump("one\0"*10)
@@ -11,3 +11,20 @@ def test_cleanBin():
assert utils.cleanBin("\nne") == "\nne"
assert utils.cleanBin("\nne", True) == ".ne"
+def test_ntop_pton():
+ for family, ip_string, packed_ip in (
+ (socket.AF_INET,
+ "127.0.0.1",
+ "\x7f\x00\x00\x01"),
+ (socket.AF_INET6,
+ "2001:0db8:85a3:08d3:1319:8a2e:0370:7344",
+ " \x01\r\xb8\x85\xa3\x08\xd3\x13\x19\x8a.\x03psD")):
+ assert ip_string == utils.inet_ntop(family, packed_ip)
+ assert packed_ip == utils.inet_pton(family, ip_string)
+ if hasattr(socket, "inet_ntop"):
+ ntop, pton = socket.inet_ntop, socket.inet_pton
+ delattr(socket,"inet_ntop")
+ delattr(socket,"inet_pton")
+ assert ip_string == utils.inet_ntop(family, packed_ip)
+ assert packed_ip == utils.inet_pton(family, ip_string)
+ socket.inet_ntop, socket.inet_pton = ntop, pton \ No newline at end of file