From 17868f61a98cb97e6b17ee58e6211e4fa89e62d4 Mon Sep 17 00:00:00 2001
From: Aldo Cortesi <aldo@nullcube.com>
Date: Sun, 14 Sep 2014 11:46:01 +1200
Subject: Remove external app option, make tick timeout explicit

---
 test/test_flow.py | 6 +++---
 test/tservers.py  | 3 +--
 2 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'test')

diff --git a/test/test_flow.py b/test/test_flow.py
index a297bf5f..cb899e2a 100644
--- a/test/test_flow.py
+++ b/test/test_flow.py
@@ -103,7 +103,7 @@ class TestClientPlaybackState:
 
         q = Queue.Queue()
         fm.state.clear()
-        fm.tick(q)
+        fm.tick(q, timeout=0)
 
         fm.stop_client_playback()
         assert not fm.client_playback
@@ -645,7 +645,7 @@ class TestFlowMaster:
 
         q = Queue.Queue()
         assert not fm.state.flow_count()
-        fm.tick(q)
+        fm.tick(q, 0)
         assert fm.state.flow_count()
 
         f.error = Error("error")
@@ -673,7 +673,7 @@ class TestFlowMaster:
 
         fm.start_server_playback(pb, False, [], True, False)
         q = Queue.Queue()
-        fm.tick(q)
+        fm.tick(q, 0)
         assert fm.should_exit.is_set()
 
         fm.stop_server_playback()
diff --git a/test/tservers.py b/test/tservers.py
index 2097631e..93c8a80a 100644
--- a/test/tservers.py
+++ b/test/tservers.py
@@ -83,7 +83,6 @@ class ProxTestBase(object):
     no_upstream_cert = False
     authenticator = None
     masterclass = TestMaster
-    externalapp = False
     certforward = False
 
     @classmethod
@@ -94,7 +93,7 @@ class ProxTestBase(object):
         cls.config = ProxyConfig(**cls.get_proxy_config())
 
         tmaster = cls.masterclass(cls.config)
-        tmaster.start_app(APP_HOST, APP_PORT, cls.externalapp)
+        tmaster.start_app(APP_HOST, APP_PORT)
         cls.proxy = ProxyThread(tmaster)
         cls.proxy.start()
 
-- 
cgit v1.2.3