diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2013-08-17 13:30:36 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2013-08-17 13:30:36 +0200 |
| commit | 729677cd85cffedec8f481f1b6025f00fb637e13 (patch) | |
| tree | 39c245643c5a3a48bd14c6e13757148bda54e2f3 /test/test_proxy.py | |
| parent | 6fe175913e611097fdfdf0a6b20b1c05909374e1 (diff) | |
| parent | a558c016d4430b67d221a369abe0cde1f4a40fce (diff) | |
| download | mitmproxy-729677cd85cffedec8f481f1b6025f00fb637e13.tar.gz mitmproxy-729677cd85cffedec8f481f1b6025f00fb637e13.tar.bz2 mitmproxy-729677cd85cffedec8f481f1b6025f00fb637e13.zip | |
Merge branch 'master' into 0.10
Diffstat (limited to 'test/test_proxy.py')
| -rw-r--r-- | test/test_proxy.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/test/test_proxy.py b/test/test_proxy.py index ed47dbac..dfccaaf7 100644 --- a/test/test_proxy.py +++ b/test/test_proxy.py @@ -56,7 +56,7 @@ class TestServerConnection: sc = proxy.ServerConnection(proxy.ProxyConfig(), "http", self.d.IFACE, self.d.port, "host.com") sc.connect() sc.connection = mock.Mock() - sc.connection.close = mock.Mock(side_effect=IOError) + sc.connection.flush = mock.Mock(side_effect=tcp.NetLibDisconnect) sc.terminate() @@ -116,9 +116,6 @@ class TestProcessProxyOptions: self.assert_noerr("--client-certs", confdir) self.assert_err("directory does not exist", "--client-certs", "nonexistent") - self.assert_noerr("--dummy-certs", confdir) - self.assert_err("directory does not exist", "--dummy-certs", "nonexistent") - def test_auth(self): p = self.assert_noerr("--nonanonymous") assert p.authenticator |