summaryrefslogtreecommitdiffhomepage
path: root/test/test_java_websockets.py
diff options
context:
space:
mode:
authorAndrei Belov <defan@nginx.com>2021-03-25 17:32:53 +0300
committerAndrei Belov <defan@nginx.com>2021-03-25 17:32:53 +0300
commit83d2ce0ae884f73a111f9b1807d5393a150bf116 (patch)
tree2c483a9eae55233df4e308c5232734e03622cee0 /test/test_java_websockets.py
parentd2579d52b9583e5add0a71c6c7fb9f1b0c948a59 (diff)
parent3c969905bd6db6446b5213acb616e8c04ff546f4 (diff)
downloadunit-83d2ce0ae884f73a111f9b1807d5393a150bf116.tar.gz
unit-83d2ce0ae884f73a111f9b1807d5393a150bf116.tar.bz2
Merged with the default branch.1.23.0-1
Diffstat (limited to 'test/test_java_websockets.py')
-rw-r--r--test/test_java_websockets.py14
1 files changed, 11 insertions, 3 deletions
diff --git a/test/test_java_websockets.py b/test/test_java_websockets.py
index 315c496d..df9e0885 100644
--- a/test/test_java_websockets.py
+++ b/test/test_java_websockets.py
@@ -27,8 +27,9 @@ class TestJavaWebsockets(TestApplicationJava):
self.check_close(sock)
- def check_close(self, sock, code=1000, no_close=False):
- frame = self.ws.frame_read(sock)
+ def check_close(self, sock, code=1000, no_close=False, frame=None):
+ if frame == None:
+ frame = self.ws.frame_read(sock)
assert frame['fin'] == True, 'close fin'
assert frame['opcode'] == self.ws.OP_CLOSE, 'close opcode'
@@ -862,7 +863,14 @@ class TestJavaWebsockets(TestApplicationJava):
self.ws.frame_write(sock, self.ws.OP_CONT, 'fragment2', fin=True)
self.ws.frame_write(sock, self.ws.OP_CONT, 'fragment3', fin=False)
self.ws.frame_write(sock, self.ws.OP_TEXT, 'fragment4', fin=True)
- self.check_close(sock, 1002)
+
+ frame = self.ws.frame_read(sock)
+
+ if frame['opcode'] == self.ws.OP_TEXT:
+ self.check_frame(frame, True, self.ws.OP_TEXT, 'fragment1fragment2')
+ frame = None
+
+ self.check_close(sock, 1002, frame=frame)
# 5_16