Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Drop private imports from test_decoders.py #2570

Merged
merged 4 commits into from
Apr 19, 2023
Merged

Drop private imports from test_decoders.py #2570

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3d877c6
Drop private imports from test_decoders.py
florimondmanca Feb 4, 2023
e77989b
Merge branch 'master' into refactor/decoders-private-imports
tomchristie Feb 9, 2023
33c7d4d
Merge branch 'master' into refactor/decoders-private-imports
tomchristie Feb 9, 2023
c81079d
Merge branch 'master' into refactor/decoders-private-imports
tomchristie Apr 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions tests/models/test_responses.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,17 +380,18 @@ def test_iter_raw():

def test_iter_raw_with_chunksize():
response = httpx.Response(200, content=streaming_body())

parts = [part for part in response.iter_raw(chunk_size=5)]
assert parts == [b"Hello", b", wor", b"ld!"]

response = httpx.Response(200, content=streaming_body())
parts = [part for part in response.iter_raw(chunk_size=7)]
assert parts == [b"Hello, ", b"world!"]

response = httpx.Response(200, content=streaming_body())
parts = [part for part in response.iter_raw(chunk_size=13)]
assert parts == [b"Hello, world!"]

response = httpx.Response(200, content=streaming_body())

parts = [part for part in response.iter_raw(chunk_size=20)]
assert parts == [b"Hello, world!"]

Expand Down Expand Up @@ -596,6 +597,14 @@ def test_iter_text_with_chunk_size():
parts = [part for part in response.iter_text(chunk_size=5)]
assert parts == ["Hello", ", wor", "ld!"]

response = httpx.Response(200, content=b"Hello, world!!")
parts = [part for part in response.iter_text(chunk_size=7)]
assert parts == ["Hello, ", "world!!"]

response = httpx.Response(200, content=b"Hello, world!")
parts = [part for part in response.iter_text(chunk_size=7)]
assert parts == ["Hello, ", "world!"]

response = httpx.Response(200, content=b"Hello, world!")
parts = [part for part in response.iter_text(chunk_size=13)]
assert parts == ["Hello, world!"]
Expand Down
135 changes: 32 additions & 103 deletions tests/test_decoders.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
import typing
import zlib

import brotli
import chardet
import pytest

import httpx
from httpx._compat import brotli
from httpx._decoders import ByteChunker, LineDecoder, TextChunker, TextDecoder


def test_deflate():
Expand Down Expand Up @@ -214,125 +213,55 @@ async def iterator() -> typing.AsyncIterator[bytes]:


def test_text_decoder_empty_cases():
decoder = TextDecoder()
assert decoder.flush() == ""
response = httpx.Response(200, content=b"")
assert response.text == ""

decoder = TextDecoder()
assert decoder.decode(b"") == ""
assert decoder.flush() == ""
response = httpx.Response(200, content=[b""])
response.read()
assert response.text == ""


def test_line_decoder_nl():
decoder = LineDecoder()
assert decoder.decode("") == []
assert decoder.decode("a\n\nb\nc") == ["a", "", "b"]
assert decoder.flush() == ["c"]
response = httpx.Response(200, content=[b""])
assert list(response.iter_lines()) == []

decoder = LineDecoder()
assert decoder.decode("") == []
assert decoder.decode("a\n\nb\nc\n") == ["a", "", "b", "c"]
assert decoder.flush() == []
response = httpx.Response(200, content=[b"", b"a\n\nb\nc"])
assert list(response.iter_lines()) == ["a", "", "b", "c"]

# Issue #1033
decoder = LineDecoder()
assert decoder.decode("") == []
assert decoder.decode("12345\n") == ["12345"]
assert decoder.decode("foo ") == []
assert decoder.decode("bar ") == []
assert decoder.decode("baz\n") == ["foo bar baz"]
assert decoder.flush() == []
response = httpx.Response(
200, content=[b"", b"12345\n", b"foo ", b"bar ", b"baz\n"]
)
assert list(response.iter_lines()) == ["12345", "foo bar baz"]


def test_line_decoder_cr():
decoder = LineDecoder()
assert decoder.decode("") == []
assert decoder.decode("a\r\rb\rc") == ["a", "", "b"]
assert decoder.flush() == ["c"]
response = httpx.Response(200, content=[b"", b"a\r\rb\rc"])
assert list(response.iter_lines()) == ["a", "", "b", "c"]

decoder = LineDecoder()
assert decoder.decode("") == []
assert decoder.decode("a\r\rb\rc\r") == ["a", "", "b"]
assert decoder.flush() == ["c"]
response = httpx.Response(200, content=[b"", b"a\r\rb\rc\r"])
assert list(response.iter_lines()) == ["a", "", "b", "c"]

# Issue #1033
decoder = LineDecoder()
assert decoder.decode("") == []
assert decoder.decode("12345\r") == []
assert decoder.decode("foo ") == ["12345"]
assert decoder.decode("bar ") == []
assert decoder.decode("baz\r") == []
assert decoder.flush() == ["foo bar baz"]
response = httpx.Response(
200, content=[b"", b"12345\r", b"foo ", b"bar ", b"baz\r"]
)
assert list(response.iter_lines()) == ["12345", "foo bar baz"]


def test_line_decoder_crnl():
decoder = LineDecoder()
assert decoder.decode("") == []
assert decoder.decode("a\r\n\r\nb\r\nc") == ["a", "", "b"]
assert decoder.flush() == ["c"]

decoder = LineDecoder()
assert decoder.decode("") == []
assert decoder.decode("a\r\n\r\nb\r\nc\r\n") == ["a", "", "b", "c"]
assert decoder.flush() == []

decoder = LineDecoder()
assert decoder.decode("") == []
assert decoder.decode("a\r") == []
assert decoder.decode("\n\r\nb\r\nc") == ["a", "", "b"]
assert decoder.flush() == ["c"]
response = httpx.Response(200, content=[b"", b"a\r\n\r\nb\r\nc"])
assert list(response.iter_lines()) == ["a", "", "b", "c"]

response = httpx.Response(200, content=[b"", b"a\r\n\r\nb\r\nc\r\n"])
assert list(response.iter_lines()) == ["a", "", "b", "c"]

response = httpx.Response(200, content=[b"", b"a\r", b"\n\r\nb\r\nc"])
assert list(response.iter_lines()) == ["a", "", "b", "c"]

# Issue #1033
decoder = LineDecoder()
assert decoder.decode("") == []
assert decoder.decode("12345\r\n") == ["12345"]
assert decoder.decode("foo ") == []
assert decoder.decode("bar ") == []
assert decoder.decode("baz\r\n") == ["foo bar baz"]
assert decoder.flush() == []


def test_byte_chunker():
decoder = ByteChunker()
assert decoder.decode(b"1234567") == [b"1234567"]
assert decoder.decode(b"89") == [b"89"]
assert decoder.flush() == []

decoder = ByteChunker(chunk_size=3)
assert decoder.decode(b"1234567") == [b"123", b"456"]
assert decoder.decode(b"89") == [b"789"]
assert decoder.flush() == []

decoder = ByteChunker(chunk_size=3)
assert decoder.decode(b"123456") == [b"123", b"456"]
assert decoder.decode(b"789") == [b"789"]
assert decoder.flush() == []

decoder = ByteChunker(chunk_size=3)
assert decoder.decode(b"123456") == [b"123", b"456"]
assert decoder.decode(b"78") == []
assert decoder.flush() == [b"78"]


def test_text_chunker():
decoder = TextChunker()
assert decoder.decode("1234567") == ["1234567"]
assert decoder.decode("89") == ["89"]
assert decoder.flush() == []

decoder = TextChunker(chunk_size=3)
assert decoder.decode("1234567") == ["123", "456"]
assert decoder.decode("89") == ["789"]
assert decoder.flush() == []

decoder = TextChunker(chunk_size=3)
assert decoder.decode("123456") == ["123", "456"]
assert decoder.decode("789") == ["789"]
assert decoder.flush() == []

decoder = TextChunker(chunk_size=3)
assert decoder.decode("123456") == ["123", "456"]
assert decoder.decode("78") == []
assert decoder.flush() == ["78"]
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Most of these cases we actually already well covered in test_responses.py, so I figured I'd expand those a bit to match coverage, and drop these.

response = httpx.Response(200, content=[b"", b"12345\r\n", b"foo bar baz\r\n"])
assert list(response.iter_lines()) == ["12345", "foo bar baz"]


def test_invalid_content_encoding_header():
Expand Down