diff options
Diffstat (limited to 'test')
-rw-r--r-- | test/test_pathod.py | 6 | ||||
-rw-r--r-- | test/tutils.py | 9 |
2 files changed, 8 insertions, 7 deletions
diff --git a/test/test_pathod.py b/test/test_pathod.py index d3013692..55a5b32e 100644 --- a/test/test_pathod.py +++ b/test/test_pathod.py @@ -210,10 +210,8 @@ class CommonTests(tutils.DaemonTests): assert r.status_code == 101 def test_websocket_frame(self): - r = self.pathoc(["ws:/p/", "wf:f'wf'"], ws_read_limit=1) - #print r - #pprint.pprint(r) - #pprint.pprint(self.d.log()) + r = self.pathoc(["ws:/p/", "wf:f'wf:b\"test\"'"], ws_read_limit=1) + assert r[1].payload == "test" class TestDaemon(CommonTests): diff --git a/test/tutils.py b/test/tutils.py index dc118bbe..1e33dfe7 100644 --- a/test/tutils.py +++ b/test/tutils.py @@ -88,9 +88,12 @@ class DaemonTests(object): c.settimeout(timeout) ret = [] for i in specs: - ret.append(c.request(i)) - return ret - + resp = c.request(i) + if resp: + ret.append(resp) + for frm in c.wait(): + ret.append(frm) + return ret @contextmanager def tmpdir(*args, **kwargs): |