diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/test_app.py | 24 | ||||
| -rw-r--r-- | test/test_pathoc.py | 8 | ||||
| -rw-r--r-- | test/test_pathod.py | 10 | ||||
| -rw-r--r-- | test/tutils.py | 2 |
4 files changed, 21 insertions, 23 deletions
diff --git a/test/test_app.py b/test/test_app.py index 4571617f..4536db8e 100644 --- a/test/test_app.py +++ b/test/test_app.py @@ -7,7 +7,7 @@ class TestApp(tutils.DaemonTests): def test_index(self): r = self.getpath("/") assert r.status_code == 200 - assert r.body + assert r.content def test_about(self): r = self.getpath("/about") @@ -38,48 +38,48 @@ class TestApp(tutils.DaemonTests): def test_response_preview(self): r = self.getpath("/response_preview", params=dict(spec="200")) assert r.status_code == 200 - assert 'Response' in r.body + assert 'Response' in r.content r = self.getpath("/response_preview", params=dict(spec="foo")) assert r.status_code == 200 - assert 'Error' in r.body + assert 'Error' in r.content r = self.getpath("/response_preview", params=dict(spec="200:b@100m")) assert r.status_code == 200 - assert "too large" in r.body + assert "too large" in r.content r = self.getpath("/response_preview", params=dict(spec="200:b@5k")) assert r.status_code == 200 - assert 'Response' in r.body + assert 'Response' in r.content r = self.getpath( "/response_preview", params=dict( spec="200:b<nonexistent")) assert r.status_code == 200 - assert 'File access denied' in r.body + assert 'File access denied' in r.content r = self.getpath("/response_preview", params=dict(spec="200:b<file")) assert r.status_code == 200 - assert 'testfile' in r.body + assert 'testfile' in r.content def test_request_preview(self): r = self.getpath("/request_preview", params=dict(spec="get:/")) assert r.status_code == 200 - assert 'Request' in r.body + assert 'Request' in r.content r = self.getpath("/request_preview", params=dict(spec="foo")) assert r.status_code == 200 - assert 'Error' in r.body + assert 'Error' in r.content r = self.getpath("/request_preview", params=dict(spec="get:/:b@100m")) assert r.status_code == 200 - assert "too large" in r.body + assert "too large" in r.content r = self.getpath("/request_preview", params=dict(spec="get:/:b@5k")) assert r.status_code == 200 - assert 'Request' in r.body + assert 'Request' in r.content r = self.getpath("/request_preview", params=dict(spec="")) assert r.status_code == 200 - assert 'empty spec' in r.body + assert 'empty spec' in r.content diff --git a/test/test_pathoc.py b/test/test_pathoc.py index 72af8b13..eb5d368d 100644 --- a/test/test_pathoc.py +++ b/test/test_pathoc.py @@ -47,7 +47,7 @@ class _TestDaemon: ) c.connect() resp = c.request("get:/api/info") - assert tuple(json.loads(resp.body)["version"]) == version.IVERSION + assert tuple(json.loads(resp.content)["version"]) == version.IVERSION def tval( self, @@ -94,7 +94,7 @@ class TestDaemonSSL(_TestDaemon): ssloptions = pathod.SSLOptions( request_client_cert=True, sans=["test1.com", "test2.com"], - alpn_select=http.ALPN_PROTO_H2, + alpn_select=b'h2', ) def test_sni(self): @@ -107,7 +107,7 @@ class TestDaemonSSL(_TestDaemon): c.connect() c.request("get:/p/200") r = c.request("get:/api/log") - d = json.loads(r.body) + d = json.loads(r.content) assert d["log"][0]["request"]["sni"] == "foobar.com" def test_showssl(self): @@ -123,7 +123,7 @@ class TestDaemonSSL(_TestDaemon): c.connect() c.request("get:/p/200") r = c.request("get:/api/log") - d = json.loads(r.body) + d = json.loads(r.content) assert d["log"][0]["request"]["clientcert"]["keyinfo"] def test_http2_without_ssl(self): diff --git a/test/test_pathod.py b/test/test_pathod.py index f8c45ad8..98da7d28 100644 --- a/test/test_pathod.py +++ b/test/test_pathod.py @@ -52,7 +52,7 @@ class TestNoApi(tutils.DaemonTests): assert self.getpath("/log").status_code == 404 r = self.getpath("/") assert r.status_code == 200 - assert not "Log" in r.body + assert not "Log" in r.content class TestNotAfterConnect(tutils.DaemonTests): @@ -120,7 +120,7 @@ class TestNocraft(tutils.DaemonTests): def test_nocraft(self): r = self.get(r"200:b'\xf0'") assert r.status_code == 800 - assert "Crafting disabled" in r.body + assert "Crafting disabled" in r.content class CommonTests(tutils.DaemonTests): @@ -153,7 +153,7 @@ class CommonTests(tutils.DaemonTests): def test_disconnect(self): rsp = self.get("202:b@100k:d200") - assert len(rsp.body) < 200 + assert len(rsp.content) < 200 def test_parserr(self): rsp = self.get("400:msg,b:") @@ -162,7 +162,7 @@ class CommonTests(tutils.DaemonTests): def test_static(self): rsp = self.get("200:b<file") assert rsp.status_code == 200 - assert rsp.body.strip() == "testfile" + assert rsp.content.strip() == "testfile" def test_anchor(self): rsp = self.getpath("anchor/foo") @@ -202,7 +202,7 @@ class CommonTests(tutils.DaemonTests): def test_source_access_denied(self): rsp = self.get("200:b</foo") assert rsp.status_code == 800 - assert "File access denied" in rsp.body + assert "File access denied" in rsp.content def test_proxy(self): r, _ = self.pathoc([r"get:'http://foo.com/p/202':da"]) diff --git a/test/tutils.py b/test/tutils.py index ceef1c15..664cdd52 100644 --- a/test/tutils.py +++ b/test/tutils.py @@ -73,12 +73,10 @@ class DaemonTests(object): verify=False, params=params ) - resp.body = resp.content return resp def get(self, spec): resp = requests.get(self.d.p(spec), verify=False) - resp.body = resp.content return resp def pathoc( |