aboutsummaryrefslogtreecommitdiffstats
path: root/test/test_flow.py
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2011-03-15 17:21:35 +1300
committerAldo Cortesi <aldo@nullcube.com>2011-03-15 17:21:35 +1300
commit6d5c32ad4b6078a72b73b695981faec36ef917c0 (patch)
treecc19a507899bcd25905a325d9a6f08e47130291c /test/test_flow.py
parentfb28e71f0b1beb68723a2d89e008793325cee715 (diff)
downloadmitmproxy-6d5c32ad4b6078a72b73b695981faec36ef917c0.tar.gz
mitmproxy-6d5c32ad4b6078a72b73b695981faec36ef917c0.tar.bz2
mitmproxy-6d5c32ad4b6078a72b73b695981faec36ef917c0.zip
Fix hang on shutdown.
Diffstat (limited to 'test/test_flow.py')
-rw-r--r--test/test_flow.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/test_flow.py b/test/test_flow.py
index 91e3f5f4..a3fa48d7 100644
--- a/test/test_flow.py
+++ b/test/test_flow.py
@@ -1,6 +1,6 @@
import Queue
from cStringIO import StringIO
-from libmproxy import console, proxy, filt, flow
+from libmproxy import console, proxy, filt, flow, controller
import tutils
import libpry
@@ -442,7 +442,7 @@ class uFlowMaster(libpry.AutoTree):
assert fm.do_server_playback(tutils.tflow())
q = Queue.Queue()
fm.tick(q)
- assert fm._shutdown
+ assert controller.exit
def test_stickycookie(self):
s = flow.State()