Merge pull request #1073 from mitmproxy/first-line-format

form_(in|out) -> first_line_format

2 files changed, 14 insertions, 14 deletions

diff --git a/test/mitmproxy/test_server.py b/test/mitmproxy/test_server.py
index dc72f032..0d56e7ea 100644
--- a/test/mitmproxy/test_server.py
+++ b/test/mitmproxy/test_server.py
@@ -973,22 +973,22 @@ class TestProxyChainingSSLReconnect(tservers.HTTPUpstreamProxyTest):
         assert not self.chain[1].tmaster.state.flows[0].response  # killed
         assert self.chain[1].tmaster.state.flows[1].response
 
-        assert self.proxy.tmaster.state.flows[0].request.form_in == "authority"
-        assert self.proxy.tmaster.state.flows[1].request.form_in == "relative"
+        assert self.proxy.tmaster.state.flows[0].request.first_line_format == "authority"
+        assert self.proxy.tmaster.state.flows[1].request.first_line_format == "relative"
 
         assert self.chain[0].tmaster.state.flows[
-            0].request.form_in == "authority"
+            0].request.first_line_format == "authority"
         assert self.chain[0].tmaster.state.flows[
-            1].request.form_in == "relative"
+            1].request.first_line_format == "relative"
         assert self.chain[0].tmaster.state.flows[
-            2].request.form_in == "authority"
+            2].request.first_line_format == "authority"
         assert self.chain[0].tmaster.state.flows[
-            3].request.form_in == "relative"
+            3].request.first_line_format == "relative"
 
         assert self.chain[1].tmaster.state.flows[
-            0].request.form_in == "relative"
+            0].request.first_line_format == "relative"
         assert self.chain[1].tmaster.state.flows[
-            1].request.form_in == "relative"
+            1].request.first_line_format == "relative"
 
         req = p.request("get:'/p/418:b\"content2\"'")
 
diff --git a/test/netlib/http/http2/test_connections.py b/test/netlib/http/http2/test_connections.py
index 0a142afa..7b003067 100644
--- a/test/netlib/http/http2/test_connections.py
+++ b/test/netlib/http/http2/test_connections.py
@@ -325,7 +325,7 @@ class TestReadRequestRelative(tservers.ServerTestBase):
 
     ssl = True
 
-    def test_asterisk_form_in(self):
+    def test_asterisk_form(self):
         c = tcp.TCPClient(("127.0.0.1", self.port))
         c.connect()
         c.convert_to_ssl()
@@ -334,7 +334,7 @@ class TestReadRequestRelative(tservers.ServerTestBase):
 
         req = protocol.read_request(NotImplemented)
 
-        assert req.form_in == "relative"
+        assert req.first_line_format == "relative"
         assert req.method == "OPTIONS"
         assert req.path == "*"
 
@@ -348,7 +348,7 @@ class TestReadRequestAbsolute(tservers.ServerTestBase):
 
     ssl = True
 
-    def test_absolute_form_in(self):
+    def test_absolute_form(self):
         c = tcp.TCPClient(("127.0.0.1", self.port))
         c.connect()
         c.convert_to_ssl()
@@ -357,7 +357,7 @@ class TestReadRequestAbsolute(tservers.ServerTestBase):
 
         req = protocol.read_request(NotImplemented)
 
-        assert req.form_in == "absolute"
+        assert req.first_line_format == "absolute"
         assert req.scheme == "http"
         assert req.host == "address"
         assert req.port == 22
@@ -382,13 +382,13 @@ class TestReadRequestConnect(tservers.ServerTestBase):
         protocol.connection_preface_performed = True
 
         req = protocol.read_request(NotImplemented)
-        assert req.form_in == "authority"
+        assert req.first_line_format == "authority"
         assert req.method == "CONNECT"
         assert req.host == "address"
         assert req.port == 22
 
         req = protocol.read_request(NotImplemented)
-        assert req.form_in == "authority"
+        assert req.first_line_format == "authority"
         assert req.method == "CONNECT"
         assert req.host == "example.com"
         assert req.port == 443