http2: change header_block_fragment handling

1 files changed, 60 insertions, 51 deletions

diff --git a/test/h2/test_frames.py b/test/h2/test_frames.py
index babf8069..30dc71e8 100644
--- a/test/h2/test_frames.py
+++ b/test/h2/test_frames.py
@@ -3,6 +3,22 @@ import tutils
 
 from nose.tools import assert_equal
 
+class FileAdapter(object):
+    def __init__(self, data, is_hex=True):
+        self.position = 0
+        if is_hex:
+            self.data = data.decode('hex')
+        else:
+            self.data = data
+
+    def safe_read(self, length):
+        if self.position + length > len(self.data):
+            raise ValueError("not enough bytes to read")
+
+        value = self.data[self.position:self.position + length]
+        self.position += length
+        return value
+
 
 def test_invalid_flags():
     tutils.raises(
@@ -26,14 +42,6 @@ def test_frame_equality():
         payload='foobar')
     assert_equal(a, b)
 
-
-def test_too_large_frames():
-    DataFrame(
-        length=6,
-        flags=Frame.FLAG_END_STREAM,
-        stream_id=0x1234567)
-
-
 def test_data_frame_to_bytes():
     f = DataFrame(
         length=6,
@@ -61,7 +69,7 @@ def test_data_frame_to_bytes():
 
 
 def test_data_frame_from_bytes():
-    f = Frame.from_bytes('000006000101234567666f6f626172'.decode('hex'))
+    f = Frame.from_file(FileAdapter('000006000101234567666f6f626172'))
     assert isinstance(f, DataFrame)
     assert_equal(f.length, 6)
     assert_equal(f.TYPE, DataFrame.TYPE)
@@ -69,7 +77,7 @@ def test_data_frame_from_bytes():
     assert_equal(f.stream_id, 0x1234567)
     assert_equal(f.payload, 'foobar')
 
-    f = Frame.from_bytes('00000a00090123456703666f6f626172000000'.decode('hex'))
+    f = Frame.from_file(FileAdapter('00000a00090123456703666f6f626172000000'))
     assert isinstance(f, DataFrame)
     assert_equal(f.length, 10)
     assert_equal(f.TYPE, DataFrame.TYPE)
@@ -93,14 +101,14 @@ def test_headers_frame_to_bytes():
         length=6,
         flags=(Frame.FLAG_NO_FLAGS),
         stream_id=0x1234567,
-        headers=[('host', 'foo.bar')])
+        header_block_fragment='668594e75e31d9'.decode('hex'))
     assert_equal(f.to_bytes().encode('hex'), '000007010001234567668594e75e31d9')
 
     f = HeadersFrame(
         length=10,
         flags=(HeadersFrame.FLAG_PADDED),
         stream_id=0x1234567,
-        headers=[('host', 'foo.bar')],
+        header_block_fragment='668594e75e31d9'.decode('hex'),
         pad_length=3)
     assert_equal(
         f.to_bytes().encode('hex'),
@@ -110,7 +118,7 @@ def test_headers_frame_to_bytes():
         length=10,
         flags=(HeadersFrame.FLAG_PRIORITY),
         stream_id=0x1234567,
-        headers=[('host', 'foo.bar')],
+        header_block_fragment='668594e75e31d9'.decode('hex'),
         exclusive=True,
         stream_dependency=0x7654321,
         weight=42)
@@ -122,7 +130,7 @@ def test_headers_frame_to_bytes():
         length=14,
         flags=(HeadersFrame.FLAG_PADDED | HeadersFrame.FLAG_PRIORITY),
         stream_id=0x1234567,
-        headers=[('host', 'foo.bar')],
+        header_block_fragment='668594e75e31d9'.decode('hex'),
         pad_length=3,
         exclusive=True,
         stream_dependency=0x7654321,
@@ -135,7 +143,7 @@ def test_headers_frame_to_bytes():
         length=14,
         flags=(HeadersFrame.FLAG_PADDED | HeadersFrame.FLAG_PRIORITY),
         stream_id=0x1234567,
-        headers=[('host', 'foo.bar')],
+        header_block_fragment='668594e75e31d9'.decode('hex'),
         pad_length=3,
         exclusive=False,
         stream_dependency=0x7654321,
@@ -148,60 +156,61 @@ def test_headers_frame_to_bytes():
         length=6,
         flags=Frame.FLAG_NO_FLAGS,
         stream_id=0x0,
-        headers=[('host', 'foo.bar')])
+        header_block_fragment='668594e75e31d9'.decode('hex'))
     tutils.raises(ValueError, f.to_bytes)
 
 
 def test_headers_frame_from_bytes():
-    f = Frame.from_bytes('000007010001234567668594e75e31d9'.decode('hex'))
+    f = Frame.from_file(FileAdapter(
+        '000007010001234567668594e75e31d9'))
     assert isinstance(f, HeadersFrame)
     assert_equal(f.length, 7)
     assert_equal(f.TYPE, HeadersFrame.TYPE)
     assert_equal(f.flags, Frame.FLAG_NO_FLAGS)
     assert_equal(f.stream_id, 0x1234567)
-    assert_equal(f.headers, [('host', 'foo.bar')])
+    assert_equal(f.header_block_fragment, '668594e75e31d9'.decode('hex'))
 
-    f = Frame.from_bytes(
-        '00000b01080123456703668594e75e31d9000000'.decode('hex'))
+    f = Frame.from_file(FileAdapter(
+        '00000b01080123456703668594e75e31d9000000'))
     assert isinstance(f, HeadersFrame)
     assert_equal(f.length, 11)
     assert_equal(f.TYPE, HeadersFrame.TYPE)
     assert_equal(f.flags, HeadersFrame.FLAG_PADDED)
     assert_equal(f.stream_id, 0x1234567)
-    assert_equal(f.headers, [('host', 'foo.bar')])
+    assert_equal(f.header_block_fragment, '668594e75e31d9'.decode('hex'))
 
-    f = Frame.from_bytes(
-        '00000c012001234567876543212a668594e75e31d9'.decode('hex'))
+    f = Frame.from_file(FileAdapter(
+        '00000c012001234567876543212a668594e75e31d9'))
     assert isinstance(f, HeadersFrame)
     assert_equal(f.length, 12)
     assert_equal(f.TYPE, HeadersFrame.TYPE)
     assert_equal(f.flags, HeadersFrame.FLAG_PRIORITY)
     assert_equal(f.stream_id, 0x1234567)
-    assert_equal(f.headers, [('host', 'foo.bar')])
+    assert_equal(f.header_block_fragment, '668594e75e31d9'.decode('hex'))
     assert_equal(f.exclusive, True)
     assert_equal(f.stream_dependency, 0x7654321)
     assert_equal(f.weight, 42)
 
-    f = Frame.from_bytes(
-        '00001001280123456703876543212a668594e75e31d9000000'.decode('hex'))
+    f = Frame.from_file(FileAdapter(
+        '00001001280123456703876543212a668594e75e31d9000000'))
     assert isinstance(f, HeadersFrame)
     assert_equal(f.length, 16)
     assert_equal(f.TYPE, HeadersFrame.TYPE)
     assert_equal(f.flags, HeadersFrame.FLAG_PADDED | HeadersFrame.FLAG_PRIORITY)
     assert_equal(f.stream_id, 0x1234567)
-    assert_equal(f.headers, [('host', 'foo.bar')])
+    assert_equal(f.header_block_fragment, '668594e75e31d9'.decode('hex'))
     assert_equal(f.exclusive, True)
     assert_equal(f.stream_dependency, 0x7654321)
     assert_equal(f.weight, 42)
 
-    f = Frame.from_bytes(
-        '00001001280123456703076543212a668594e75e31d9000000'.decode('hex'))
+    f = Frame.from_file(FileAdapter(
+        '00001001280123456703076543212a668594e75e31d9000000'))
     assert isinstance(f, HeadersFrame)
     assert_equal(f.length, 16)
     assert_equal(f.TYPE, HeadersFrame.TYPE)
     assert_equal(f.flags, HeadersFrame.FLAG_PADDED | HeadersFrame.FLAG_PRIORITY)
     assert_equal(f.stream_id, 0x1234567)
-    assert_equal(f.headers, [('host', 'foo.bar')])
+    assert_equal(f.header_block_fragment, '668594e75e31d9'.decode('hex'))
     assert_equal(f.exclusive, False)
     assert_equal(f.stream_dependency, 0x7654321)
     assert_equal(f.weight, 42)
@@ -212,7 +221,7 @@ def test_headers_frame_human_readable():
         length=7,
         flags=(HeadersFrame.FLAG_PADDED | HeadersFrame.FLAG_PRIORITY),
         stream_id=0x1234567,
-        headers=[],
+        header_block_fragment=b'',
         pad_length=3,
         exclusive=False,
         stream_dependency=0x7654321,
@@ -223,7 +232,7 @@ def test_headers_frame_human_readable():
         length=14,
         flags=(HeadersFrame.FLAG_PADDED | HeadersFrame.FLAG_PRIORITY),
         stream_id=0x1234567,
-        headers=[('host', 'foo.bar')],
+        header_block_fragment='668594e75e31d9'.decode('hex'),
         pad_length=3,
         exclusive=False,
         stream_dependency=0x7654321,
@@ -266,7 +275,7 @@ def test_priority_frame_to_bytes():
 
 
 def test_priority_frame_from_bytes():
-    f = Frame.from_bytes('000005020001234567876543212a'.decode('hex'))
+    f = Frame.from_file(FileAdapter('000005020001234567876543212a'))
     assert isinstance(f, PriorityFrame)
     assert_equal(f.length, 5)
     assert_equal(f.TYPE, PriorityFrame.TYPE)
@@ -276,7 +285,7 @@ def test_priority_frame_from_bytes():
     assert_equal(f.stream_dependency, 0x7654321)
     assert_equal(f.weight, 42)
 
-    f = Frame.from_bytes('0000050200012345670765432115'.decode('hex'))
+    f = Frame.from_file(FileAdapter('0000050200012345670765432115'))
     assert isinstance(f, PriorityFrame)
     assert_equal(f.length, 5)
     assert_equal(f.TYPE, PriorityFrame.TYPE)
@@ -314,7 +323,7 @@ def test_rst_stream_frame_to_bytes():
 
 
 def test_rst_stream_frame_from_bytes():
-    f = Frame.from_bytes('00000403000123456707654321'.decode('hex'))
+    f = Frame.from_file(FileAdapter('00000403000123456707654321'))
     assert isinstance(f, RstStreamFrame)
     assert_equal(f.length, 4)
     assert_equal(f.TYPE, RstStreamFrame.TYPE)
@@ -372,21 +381,21 @@ def test_settings_frame_to_bytes():
 
 
 def test_settings_frame_from_bytes():
-    f = Frame.from_bytes('000000040000000000'.decode('hex'))
+    f = Frame.from_file(FileAdapter('000000040000000000'))
     assert isinstance(f, SettingsFrame)
     assert_equal(f.length, 0)
     assert_equal(f.TYPE, SettingsFrame.TYPE)
     assert_equal(f.flags, Frame.FLAG_NO_FLAGS)
     assert_equal(f.stream_id, 0x0)
 
-    f = Frame.from_bytes('000000040100000000'.decode('hex'))
+    f = Frame.from_file(FileAdapter('000000040100000000'))
     assert isinstance(f, SettingsFrame)
     assert_equal(f.length, 0)
     assert_equal(f.TYPE, SettingsFrame.TYPE)
     assert_equal(f.flags, SettingsFrame.FLAG_ACK)
     assert_equal(f.stream_id, 0x0)
 
-    f = Frame.from_bytes('000006040100000000000200000001'.decode('hex'))
+    f = Frame.from_file(FileAdapter('000006040100000000000200000001'))
     assert isinstance(f, SettingsFrame)
     assert_equal(f.length, 6)
     assert_equal(f.TYPE, SettingsFrame.TYPE)
@@ -395,8 +404,8 @@ def test_settings_frame_from_bytes():
     assert_equal(len(f.settings), 1)
     assert_equal(f.settings[SettingsFrame.SETTINGS.SETTINGS_ENABLE_PUSH], 1)
 
-    f = Frame.from_bytes(
-        '00000c040000000000000200000001000312345678'.decode('hex'))
+    f = Frame.from_file(FileAdapter(
+        '00000c040000000000000200000001000312345678'))
     assert isinstance(f, SettingsFrame)
     assert_equal(f.length, 12)
     assert_equal(f.TYPE, SettingsFrame.TYPE)
@@ -466,7 +475,7 @@ def test_push_promise_frame_to_bytes():
 
 
 def test_push_promise_frame_from_bytes():
-    f = Frame.from_bytes('00000a05000123456707654321666f6f626172'.decode('hex'))
+    f = Frame.from_file(FileAdapter('00000a05000123456707654321666f6f626172'))
     assert isinstance(f, PushPromiseFrame)
     assert_equal(f.length, 10)
     assert_equal(f.TYPE, PushPromiseFrame.TYPE)
@@ -474,8 +483,8 @@ def test_push_promise_frame_from_bytes():
     assert_equal(f.stream_id, 0x1234567)
     assert_equal(f.header_block_fragment, 'foobar')
 
-    f = Frame.from_bytes(
-        '00000e0508012345670307654321666f6f626172000000'.decode('hex'))
+    f = Frame.from_file(FileAdapter(
+        '00000e0508012345670307654321666f6f626172000000'))
     assert isinstance(f, PushPromiseFrame)
     assert_equal(f.length, 14)
     assert_equal(f.TYPE, PushPromiseFrame.TYPE)
@@ -522,7 +531,7 @@ def test_ping_frame_to_bytes():
 
 
 def test_ping_frame_from_bytes():
-    f = Frame.from_bytes('000008060100000000666f6f6261720000'.decode('hex'))
+    f = Frame.from_file(FileAdapter('000008060100000000666f6f6261720000'))
     assert isinstance(f, PingFrame)
     assert_equal(f.length, 8)
     assert_equal(f.TYPE, PingFrame.TYPE)
@@ -530,7 +539,7 @@ def test_ping_frame_from_bytes():
     assert_equal(f.stream_id, 0x0)
     assert_equal(f.payload, b'foobar\0\0')
 
-    f = Frame.from_bytes('000008060000000000666f6f6261726465'.decode('hex'))
+    f = Frame.from_file(FileAdapter('000008060000000000666f6f6261726465'))
     assert isinstance(f, PingFrame)
     assert_equal(f.length, 8)
     assert_equal(f.TYPE, PingFrame.TYPE)
@@ -581,8 +590,8 @@ def test_goaway_frame_to_bytes():
 
 
 def test_goaway_frame_from_bytes():
-    f = Frame.from_bytes(
-        '0000080700000000000123456787654321'.decode('hex'))
+    f = Frame.from_file(FileAdapter(
+        '0000080700000000000123456787654321'))
     assert isinstance(f, GoAwayFrame)
     assert_equal(f.length, 8)
     assert_equal(f.TYPE, GoAwayFrame.TYPE)
@@ -592,8 +601,8 @@ def test_goaway_frame_from_bytes():
     assert_equal(f.error_code, 0x87654321)
     assert_equal(f.data, b'')
 
-    f = Frame.from_bytes(
-        '00000e0700000000000123456787654321666f6f626172'.decode('hex'))
+    f = Frame.from_file(FileAdapter(
+        '00000e0700000000000123456787654321666f6f626172'))
     assert isinstance(f, GoAwayFrame)
     assert_equal(f.length, 14)
     assert_equal(f.TYPE, GoAwayFrame.TYPE)
@@ -642,7 +651,7 @@ def test_window_update_frame_to_bytes():
 
 
 def test_window_update_frame_from_bytes():
-    f = Frame.from_bytes('00000408000000000001234567'.decode('hex'))
+    f = Frame.from_file(FileAdapter('00000408000000000001234567'))
     assert isinstance(f, WindowUpdateFrame)
     assert_equal(f.length, 4)
     assert_equal(f.TYPE, WindowUpdateFrame.TYPE)
@@ -677,7 +686,7 @@ def test_continuation_frame_to_bytes():
 
 
 def test_continuation_frame_from_bytes():
-    f = Frame.from_bytes('000006090401234567666f6f626172'.decode('hex'))
+    f = Frame.from_file(FileAdapter('000006090401234567666f6f626172'))
     assert isinstance(f, ContinuationFrame)
     assert_equal(f.length, 6)
     assert_equal(f.TYPE, ContinuationFrame.TYPE)