aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2016-06-08 10:14:34 +1200
committerAldo Cortesi <aldo@nullcube.com>2016-06-08 10:14:34 +1200
commit982077ec31ddffeab9830a02b425c35cb0b0dac5 (patch)
treec71d78436605e9255add4fd3622aecaa4ede5d63 /test
parentdb11fe0087776c2bf5d95f5aeb751c6c35d67f4b (diff)
downloadmitmproxy-982077ec31ddffeab9830a02b425c35cb0b0dac5.tar.gz
mitmproxy-982077ec31ddffeab9830a02b425c35cb0b0dac5.tar.bz2
mitmproxy-982077ec31ddffeab9830a02b425c35cb0b0dac5.zip
Add reply.ack and reply.kill
Diffstat (limited to 'test')
-rw-r--r--test/mitmproxy/test_server.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/test/mitmproxy/test_server.py b/test/mitmproxy/test_server.py
index b58c4f44..1cd6cb0c 100644
--- a/test/mitmproxy/test_server.py
+++ b/test/mitmproxy/test_server.py
@@ -14,7 +14,6 @@ from pathod import pathoc, pathod
from mitmproxy import controller
from mitmproxy.proxy.config import HostMatcher
-from mitmproxy.exceptions import Kill
from mitmproxy.models import Error, HTTPResponse, HTTPFlow
from . import tutils, tservers
@@ -771,7 +770,7 @@ class MasterKillRequest(tservers.TestMaster):
@controller.handler
def request(self, f):
- f.reply(Kill)
+ f.reply.kill()
class TestKillRequest(tservers.HTTPProxyTest):
@@ -788,7 +787,7 @@ class MasterKillResponse(tservers.TestMaster):
@controller.handler
def response(self, f):
- f.reply(Kill)
+ f.reply.kill()
class TestKillResponse(tservers.HTTPProxyTest):
@@ -942,7 +941,7 @@ class TestProxyChainingSSLReconnect(tservers.HTTPUpstreamProxyTest):
if not (k[0] in exclude):
f.client_conn.finish()
f.error = Error("terminated")
- f.reply(Kill)
+ f.reply.kill()
return _func(f)
setattr(master, attr, handler)