diff options
| author | Henrik Nordstrom <henrik@henriknordstrom.net> | 2011-02-03 23:30:03 +0100 |
|---|---|---|
| committer | Henrik Nordstrom <henrik@henriknordstrom.net> | 2011-02-03 23:30:03 +0100 |
| commit | 5bf6482bd08d4eadda36b9b6f67fbf34016c603d (patch) | |
| tree | d2056001b4f059e4efa06d31884cf33a8b156a17 /test/test_console.py | |
| parent | 2f813fa74818bcaaca8b0182eda004ea91a0d504 (diff) | |
| parent | 2ad4c5adf38e627fc4534548610235ce1c590c66 (diff) | |
| download | mitmproxy-5bf6482bd08d4eadda36b9b6f67fbf34016c603d.tar.gz mitmproxy-5bf6482bd08d4eadda36b9b6f67fbf34016c603d.tar.bz2 mitmproxy-5bf6482bd08d4eadda36b9b6f67fbf34016c603d.zip | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'test/test_console.py')
| -rw-r--r-- | test/test_console.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/test/test_console.py b/test/test_console.py index 98a1270f..179b116d 100644 --- a/test/test_console.py +++ b/test/test_console.py @@ -10,7 +10,7 @@ class uState(libpry.AutoTree): connect -> request -> response """ - bc = proxy.BrowserConnection("address", 22) + bc = proxy.ClientConnection(("address", 22)) c = console.ConsoleState() f = flow.Flow(bc) c.add_browserconnect(f) @@ -25,7 +25,7 @@ class uState(libpry.AutoTree): """ c = console.ConsoleState() - bc = proxy.BrowserConnection("address", 22) + bc = proxy.ClientConnection(("address", 22)) f = flow.Flow(bc) c.add_browserconnect(f) assert c.get_focus() == (f, 0) @@ -33,7 +33,7 @@ class uState(libpry.AutoTree): assert c.get_from_pos(1) == (None, None) assert c.get_next(0) == (None, None) - bc2 = proxy.BrowserConnection("address", 22) + bc2 = proxy.ClientConnection(("address", 22)) f2 = flow.Flow(bc2) c.add_browserconnect(f2) assert c.get_focus() == (f, 1) @@ -54,7 +54,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 @@ -67,7 +67,7 @@ class uState(libpry.AutoTree): c = console.ConsoleState() f = utils.tflow() c.add_browserconnect(f) - q = utils.treq(f.connection) + q = utils.treq(f.client_conn) c.focus = None assert c.add_request(q) @@ -117,7 +117,7 @@ class uformat_flow(libpry.AutoTree): assert ('method', '[edited] ') in console.format_flow(f, True) assert ('method', '[edited] ') in console.format_flow(f, True, True) - f.connection = flow.ReplayConnection() + f.client_conn = proxy.ClientConnection(None) assert ('method', '[replay] ') in console.format_flow(f, True) assert ('method', '[replay] ') in console.format_flow(f, True, True) |