diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/test_cmdline.py | 2 | ||||
| -rw-r--r-- | test/test_language_actions.py | 2 | ||||
| -rw-r--r-- | test/test_language_base.py | 4 | ||||
| -rw-r--r-- | test/test_language_http.py | 10 | ||||
| -rw-r--r-- | test/test_language_websocket.py | 2 | ||||
| -rw-r--r-- | test/test_pathoc.py | 2 |
6 files changed, 11 insertions, 11 deletions
diff --git a/test/test_cmdline.py b/test/test_cmdline.py index b9607029..c1b55608 100644 --- a/test/test_cmdline.py +++ b/test/test_cmdline.py @@ -135,7 +135,7 @@ def test_pathoc(perror): tutils.test_data.path("data/request") ] ) - assert len(a.requests) == 1 + assert len(list(a.requests)) == 1 a = cmdline.args_pathod( [ diff --git a/test/test_language_actions.py b/test/test_language_actions.py index b0d97887..3ead141a 100644 --- a/test/test_language_actions.py +++ b/test/test_language_actions.py @@ -5,7 +5,7 @@ from libpathod import language def parse_request(s): - return language.parse_pathoc(s)[0] + return language.parse_pathoc(s).next() def test_unique_name(): diff --git a/test/test_language_base.py b/test/test_language_base.py index e14b741f..b2296e3a 100644 --- a/test/test_language_base.py +++ b/test/test_language_base.py @@ -6,11 +6,11 @@ import nose.tools as nt def parse_request(s): - return language.parse_pathoc(s)[0] + return language.parse_pathoc(s).next() def test_times(): - reqs = language.parse_pathoc("get:/:x5") + reqs = list(language.parse_pathoc("get:/:x5")) assert len(reqs) == 5 assert not reqs[0].times diff --git a/test/test_language_http.py b/test/test_language_http.py index f1484da5..f9bbd273 100644 --- a/test/test_language_http.py +++ b/test/test_language_http.py @@ -6,7 +6,7 @@ import tutils def parse_request(s): - return language.parse_pathoc(s)[0] + return language.parse_pathoc(s).next() def test_make_error_response(): @@ -32,7 +32,7 @@ class TestRequest: assert len(r.path.string()) == 1024 def test_multiple(self): - r = language.parse_pathoc("GET:/ PUT:/") + r = list(language.parse_pathoc("GET:/ PUT:/")) assert r[0].method.string() == "GET" assert r[1].method.string() == "PUT" assert len(r) == 2 @@ -52,7 +52,7 @@ class TestRequest: ir,@1 """ - r = language.parse_pathoc(l) + r = list(language.parse_pathoc(l)) assert len(r) == 2 assert r[0].method.string() == "GET" assert r[1].method.string() == "PUT" @@ -61,14 +61,14 @@ class TestRequest: get:"http://localhost:9999/p/200":ir,@1 get:"http://localhost:9999/p/200":ir,@2 """ - r = language.parse_pathoc(l) + r = list(language.parse_pathoc(l)) assert len(r) == 2 assert r[0].method.string() == "GET" assert r[1].method.string() == "GET" def test_nested_response(self): l = "get:/p:s'200'" - r = language.parse_pathoc(l) + r = list(language.parse_pathoc(l)) assert len(r) == 1 assert len(r[0].tokens) == 3 assert isinstance(r[0].tokens[2], http.NestedResponse) diff --git a/test/test_language_websocket.py b/test/test_language_websocket.py index f75562c9..e7f333b4 100644 --- a/test/test_language_websocket.py +++ b/test/test_language_websocket.py @@ -6,7 +6,7 @@ import tutils def parse_request(s): - return language.parse_pathoc(s)[0] + return language.parse_pathoc(s).next() class TestWebsocketFrame: diff --git a/test/test_pathoc.py b/test/test_pathoc.py index 994975fc..556aada5 100644 --- a/test/test_pathoc.py +++ b/test/test_pathoc.py @@ -73,7 +73,7 @@ class _TestDaemon: if timeout: c.settimeout(timeout) for i in requests: - r = language.parse_pathoc(i)[0] + r = language.parse_pathoc(i).next() if explain: r = r.freeze(language.Settings()) try: |