From 562ac9e721c33b05e8889d4932dede794a9746a8 Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Mon, 21 Jul 2014 14:09:24 +0200 Subject: unify stream handling --- test/test_server.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'test/test_server.py') diff --git a/test/test_server.py b/test/test_server.py index 71f00d96..d7318849 100644 --- a/test/test_server.py +++ b/test/test_server.py @@ -427,16 +427,15 @@ class TestStreamRequest(tservers.HTTPProxTest): fconn = connection.makefile() spec = '200:h"Transfer-Encoding"="chunked":r:b"4\\r\\nthis\\r\\n7\\r\\nisatest\\r\\n0\\r\\n\\r\\n"' connection.send("GET %s/p/%s HTTP/1.1\r\n"%(self.server.urlbase, spec)) - connection.send("\r\n"); + connection.send("\r\n") - httpversion, code, msg, headers, content = http.read_response(fconn, "GET", 100000, include_body=False) + httpversion, code, msg, headers, content = http.read_response(fconn, "GET", None, include_body=False) assert headers["Transfer-Encoding"][0] == 'chunked' assert code == 200 - assert http.read_next_chunk(fconn, headers, False) == "this" - assert http.read_next_chunk(fconn, headers, False) == "isatest" - assert http.read_next_chunk(fconn, headers, False) == None + chunks = list(content for _, content, _ in http.read_http_body_chunked(fconn, headers, None, "GET", 200, False)) + assert chunks == ["this", "isatest", ""] connection.close() -- cgit v1.2.3