aboutsummaryrefslogtreecommitdiffstats
path: root/test/test_server.py
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2014-09-07 18:01:30 +0200
committerMaximilian Hils <git@maximilianhils.com>2014-09-07 18:01:37 +0200
commitac27d1236fdbf69c826b5d2bb4c69ebbe8ab40a1 (patch)
treeac0e57ea2e7bb540c23fb1149d900a7d24e50b0b /test/test_server.py
parent58ea19869897deee5d561d2c31a03233c047fbe3 (diff)
downloadmitmproxy-ac27d1236fdbf69c826b5d2bb4c69ebbe8ab40a1.tar.gz
mitmproxy-ac27d1236fdbf69c826b5d2bb4c69ebbe8ab40a1.tar.bz2
mitmproxy-ac27d1236fdbf69c826b5d2bb4c69ebbe8ab40a1.zip
improve change_server api, add example how to change the upstream server
Diffstat (limited to 'test/test_server.py')
-rw-r--r--test/test_server.py14
1 files changed, 6 insertions, 8 deletions
diff --git a/test/test_server.py b/test/test_server.py
index d33bcc89..b128d0a2 100644
--- a/test/test_server.py
+++ b/test/test_server.py
@@ -387,14 +387,12 @@ class MasterRedirectRequest(tservers.TestMaster):
def handle_request(self, f):
request = f.request
if request.path == "/p/201":
- url = request.url
- new = "http://127.0.0.1:%s/p/201" % self.redirect_port
-
- request.url = new
- f.live.change_server(("127.0.0.1", self.redirect_port), False)
- request.url = url
- tutils.raises("SSL handshake error", f.live.change_server, ("127.0.0.1", self.redirect_port), True)
- request.url = new
+ addr = f.live.c.server_conn.address
+ assert f.live.change_server(("127.0.0.1", self.redirect_port), ssl=False)
+ assert not f.live.change_server(("127.0.0.1", self.redirect_port), ssl=False)
+ tutils.raises("SSL handshake error", f.live.change_server, ("127.0.0.1", self.redirect_port), ssl=True)
+ assert f.live.change_server(addr, ssl=False)
+ request.url = "http://127.0.0.1:%s/p/201" % self.redirect_port
tservers.TestMaster.handle_request(self, f)
def handle_response(self, f):