aboutsummaryrefslogtreecommitdiffstats
path: root/test/test_tcp.py
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2013-01-26 21:29:45 +1300
committerAldo Cortesi <aldo@nullcube.com>2013-01-26 21:29:45 +1300
commit7433dfceae3b2ac7e709fbcedd9e298800d2ac1b (patch)
tree24e14720a95dbb8ed82e156e7173baca6f5bbc5c /test/test_tcp.py
parente5b125eec8e732112af9884cf3ab35377913303a (diff)
downloadmitmproxy-7433dfceae3b2ac7e709fbcedd9e298800d2ac1b.tar.gz
mitmproxy-7433dfceae3b2ac7e709fbcedd9e298800d2ac1b.tar.bz2
mitmproxy-7433dfceae3b2ac7e709fbcedd9e298800d2ac1b.zip
Bump unit tests, fix two serious wee buglets discovered.
Diffstat (limited to 'test/test_tcp.py')
-rw-r--r--test/test_tcp.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/test/test_tcp.py b/test/test_tcp.py
index e7524fdc..6ff42072 100644
--- a/test/test_tcp.py
+++ b/test/test_tcp.py
@@ -90,7 +90,7 @@ class TestServerSSL(test.ServerTestBase):
def test_echo(self):
c = tcp.TCPClient("127.0.0.1", self.port)
c.connect()
- c.convert_to_ssl(sni="foo.com")
+ c.convert_to_ssl(sni="foo.com", options=tcp.OP_ALL)
testval = "echo!\n"
c.wfile.write(testval)
c.wfile.flush()
@@ -193,6 +193,7 @@ class TestTimeOut(test.ServerTestBase):
c = tcp.TCPClient("127.0.0.1", self.port)
c.connect()
c.settimeout(0.1)
+ assert c.gettimeout() == 0.1
tutils.raises(tcp.NetLibTimeout, c.rfile.read, 10)