Report wait time of failed wait for test socket server (#930)

Author: BCSharp

Tests/modules/network_related/test__socket.py

@@ -426,18 +426,21 @@ def server_thread():
 
         _thread.start_new_thread(server_thread, ())
         #Give the server a chance to startup
-        for _ in range(10):
+        portex = None
+        startTime = time.perf_counter()
+        for _ in range(20):
             time.sleep(1)
             if EXIT_CODE > 0:
                 self.fail("Server died with exit code %d" % EXIT_CODE)
             try:
                 with open(portFile) as f:
                     PORT = int(f.read())
                 break
-            except:
-                pass
+            except Exception as ex:
+                portex = ex
         else:
-            self.fail("Server not detected")
+            duration = time.perf_counter() - startTime
+            self.fail("Server not detected after trying for %g s, last detection attempt resulted in %r" % (duration, portex))
 
         #Client
         HOST = 'localhost'
@@ -562,18 +565,21 @@ def server_thread():
 
         _thread.start_new_thread(server_thread, ())
         #Give the server a chance to startup
-        for _ in range(10):
+        portex = None
+        startTime = time.perf_counter()
+        for _ in range(20):
             time.sleep(1)
             if EXIT_CODE > 0:
                 self.fail("Server died with exit code %d" % EXIT_CODE)
             try:
                 with open(portFile) as f:
                     PORT = int(f.read())
                 break
-            except:
-                pass
+            except Exception as ex:
+                portex = ex
         else:
-            self.fail("Server not detected")
+            duration = time.perf_counter() - startTime
+            self.fail("Server not detected after trying for %g s, last detection attempt resulted in %r" % (duration, portex))
 
         #Client
         HOST = 'localhost'