Merge remote-tracking branch 'origin/master'

1 files changed, 8 insertions, 10 deletions

diff --git a/test/test_flow.py b/test/test_flow.py
index 59b277e4..9629934f 100644
--- a/test/test_flow.py
+++ b/test/test_flow.py
@@ -39,8 +39,6 @@ class uFlow(libpry.AutoTree):
 
     def test_getset_state(self):
         f = utils.tflow()
-        state = f.get_state() 
-        assert f == flow.Flow.from_state(state)
         f.response = utils.tresp()
         f.request = f.response.request
         state = f.get_state() 
@@ -66,7 +64,7 @@ class uFlow(libpry.AutoTree):
         assert console.format_flow(f, True)
         assert console.format_flow(f, False)
 
-        f.connection = flow.ReplayConnection()
+        f.client_conn.set_replay()
         assert console.format_flow(f, True)
         assert console.format_flow(f, False)
 
@@ -115,7 +113,7 @@ class uFlow(libpry.AutoTree):
 
 class uState(libpry.AutoTree):
     def test_backup(self):
-        bc = proxy.BrowserConnection("address", 22)
+        bc = proxy.ClientConnection(("address", 22))
         c = flow.State()
         f = flow.Flow(bc)
         c.add_browserconnect(f)
@@ -129,7 +127,7 @@ class uState(libpry.AutoTree):
 
                 connect -> request -> response
         """
-        bc = proxy.BrowserConnection("address", 22)
+        bc = proxy.ClientConnection(("address", 22))
         c = flow.State()
         f = flow.Flow(bc)
         c.add_browserconnect(f)
@@ -154,14 +152,14 @@ class uState(libpry.AutoTree):
         assert not c.lookup(newresp)
 
     def test_err(self):
-        bc = proxy.BrowserConnection("address", 22)
+        bc = proxy.ClientConnection(("address", 22))
         c = flow.State()
         f = flow.Flow(bc)
         c.add_browserconnect(f)
         e = proxy.Error(bc, "message")
         assert c.add_error(e)
 
-        e = proxy.Error(proxy.BrowserConnection("address", 22), "message")
+        e = proxy.Error(proxy.ClientConnection(("address", 22)), "message")
         assert not c.add_error(e)
 
     def test_view(self):
@@ -176,7 +174,7 @@ class uState(libpry.AutoTree):
 
         
         f = utils.tflow()
-        req = utils.treq(f.connection)
+        req = utils.treq(f.client_conn)
         c.add_browserconnect(f)
         c.add_request(req)
         assert len(c.view) == 2
@@ -188,7 +186,7 @@ class uState(libpry.AutoTree):
     def _add_request(self, state):
         f = utils.tflow()
         state.add_browserconnect(f)
-        q = utils.treq(f.connection)
+        q = utils.treq(f.client_conn)
         state.add_request(q)
         return f
 
@@ -201,7 +199,7 @@ class uState(libpry.AutoTree):
         f = utils.tflow()
         f.error = proxy.Error(None, "msg")
         state.add_browserconnect(f)
-        q = utils.treq(f.connection)
+        q = utils.treq(f.client_conn)
         state.add_request(q)
 
     def test_kill_flow(self):