Merged with the default branch.1.13.0-1

1 files changed, 19 insertions, 1 deletions

diff --git a/test/unit/http.py b/test/unit/http.py
index 82a6bd6a..c7e3e36d 100644
--- a/test/unit/http.py
+++ b/test/unit/http.py
@@ -1,4 +1,5 @@
 import re
+import time
 import socket
 import select
 from unit.main import TestUnit
@@ -63,7 +64,7 @@ class TestHTTP(TestUnit):
         if 'raw' not in kwargs:
             req = ' '.join([start_str, url, http]) + crlf
 
-            if body is not b'':
+            if body != b'':
                 if isinstance(body, str):
                     body = body.encode()
 
@@ -178,3 +179,20 @@ class TestHTTP(TestUnit):
                 headers[m.group(1)] = [headers[m.group(1)], m.group(2)]
 
         return {'status': int(status), 'headers': headers, 'body': body}
+
+    def waitforsocket(self, port):
+        ret = False
+
+        for i in range(50):
+            try:
+                sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+                sock.connect(('127.0.0.1', port))
+                ret = True
+                break
+            except:
+                sock.close()
+                time.sleep(0.1)
+
+        sock.close()
+
+        self.assertTrue(ret, 'socket connected')