push failing tests down to 43

1 files changed, 20 insertions, 20 deletions

diff --git a/test/test_server.py b/test/test_server.py
index d3bf4676..f542062d 100644
--- a/test/test_server.py
+++ b/test/test_server.py
@@ -4,6 +4,7 @@ from netlib import tcp, http_auth, http
 from libpathod import pathoc, pathod
 import tutils, tservers
 from libmproxy import flow, proxy
+from libmproxy.protocol import KILL
 
 """
     Note that the choice of response code in these tests matters more than you
@@ -19,8 +20,8 @@ class CommonMixin:
 
     def test_replay(self):
         assert self.pathod("304").status_code == 304
-        assert len(self.master.state.view) == (2 if self.ssl else 1)
-        l = self.master.state.view[1 if self.ssl else 0]
+        assert len(self.master.state.view) == 1
+        l = self.master.state.view[0]
         assert l.response.code == 304
         l.request.path = "/p/305"
         rt = self.master.replay_request(l, block=True)
@@ -109,7 +110,7 @@ class TestHTTP(tservers.HTTPProxTest, CommonMixin, AppMixin):
     def test_proxy_ioerror(self):
         # Tests a difficult-to-trigger condition, where an IOError is raised
         # within our read loop.
-        with mock.patch("libmproxy.protocol.HTTPRequest.from_stream") as m:
+        with mock.patch("libmproxy.protocol.http.HTTPRequest.from_stream") as m:
             m.side_effect = IOError("error!")
             tutils.raises("server disconnect", self.pathod, "304")
 
@@ -240,10 +241,10 @@ class TestProxy(tservers.HTTPProxTest):
         f = self.pathod("304")
         assert f.status_code == 304
 
-        l = self.master.state.view[0]
-        assert l.request.client_conn.address
-        assert "host" in l.request.headers
-        assert l.response.code == 304
+        f = self.master.state.view[0]
+        assert f.client_conn.address
+        assert "host" in f.request.headers
+        assert f.response.code == 304
 
     def test_response_timestamps(self):
         # test that we notice at least 2 sec delay between timestamps
@@ -285,8 +286,7 @@ class TestProxy(tservers.HTTPProxTest):
         assert request.timestamp_end - request.timestamp_start <= 0.1
 
     def test_request_tcp_setup_timestamp_presence(self):
-        # tests that the first request in a tcp connection has a tcp_setup_timestamp
-        # while others do not
+        # tests that the client_conn a tcp connection has a tcp_setup_timestamp
         connection = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
         connection.connect(("localhost", self.proxy.port))
         connection.send("GET http://localhost:%d/p/304:b@1k HTTP/1.1\r\n"%self.server.port)
@@ -297,18 +297,18 @@ class TestProxy(tservers.HTTPProxTest):
         connection.recv(5000)
         connection.close()
 
-        first_request = self.master.state.view[0].request
-        second_request = self.master.state.view[1].request
-        assert first_request.tcp_setup_timestamp
-        assert first_request.ssl_setup_timestamp == None
-        assert second_request.tcp_setup_timestamp == None
-        assert second_request.ssl_setup_timestamp == None
+        first_flow = self.master.state.view[0]
+        second_flow = self.master.state.view[1]
+        assert first_flow.server_conn.timestamp_tcp_setup
+        assert first_flow.server_conn.timestamp_ssl_setup is None
+        assert second_flow.server_conn.timestamp_tcp_setup
+        assert first_flow.server_conn.timestamp_tcp_setup == second_flow.server_conn.timestamp_tcp_setup
 
     def test_request_ip(self):
         f = self.pathod("200:b@100")
         assert f.status_code == 200
-        request = self.master.state.view[0].request
-        assert request.ip == "127.0.0.1"
+        f = self.master.state.view[0]
+        assert f.server_conn.peername == ("127.0.0.1", self.server.port)
 
 class TestProxySSL(tservers.HTTPProxTest):
     ssl=True
@@ -317,7 +317,7 @@ class TestProxySSL(tservers.HTTPProxTest):
         f = self.pathod("304:b@10k")
         assert f.status_code == 304
         first_request = self.master.state.view[0].request
-        assert first_request.ssl_setup_timestamp
+        assert first_request.flow.server_conn.timestamp_ssl_setup
 
 class MasterFakeResponse(tservers.TestMaster):
     def handle_request(self, m):
@@ -334,7 +334,7 @@ class TestFakeResponse(tservers.HTTPProxTest):
 
 class MasterKillRequest(tservers.TestMaster):
     def handle_request(self, m):
-        m.reply(proxy.KILL)
+        m.reply(KILL)
 
 
 class TestKillRequest(tservers.HTTPProxTest):
@@ -347,7 +347,7 @@ class TestKillRequest(tservers.HTTPProxTest):
 
 class MasterKillResponse(tservers.TestMaster):
     def handle_response(self, m):
-        m.reply(proxy.KILL)
+        m.reply(KILL)
 
 
 class TestKillResponse(tservers.HTTPProxTest):