X-Git-Url: https://mudpy.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=mudpy%2Ftests%2Fselftest.py;h=f8caf35aa1583ec0c798af7f2817a57b0cf74c68;hb=HEAD;hp=88b95c0db650d8629726011e210c8745d929d3fd;hpb=787d1bc42c8b9cde309709f520e254e66a23ff8d;p=mudpy.git

diff --git a/mudpy/tests/selftest.py b/mudpy/tests/selftest.py
index 88b95c0..f8caf35 100644
--- a/mudpy/tests/selftest.py
+++ b/mudpy/tests/selftest.py
@@ -461,7 +461,6 @@ def start_service(config):
         try:
             # Stop the running service
             os.kill(pid, 15)
-            time.sleep(1)
         except ProcessLookupError:
             # If there was no process, just remove the stale PID file
             os.remove(pidfile)
@@ -478,7 +477,6 @@ def start_service(config):
     service = subprocess.Popen(("mudpy", config),
                                stdout=subprocess.PIPE,
                                stderr=subprocess.PIPE)
-    time.sleep(1)
     return service
 
 
@@ -521,6 +519,13 @@ def stop_service(service):
     with open("capture_stderr.log", "w") as serviceerr:
         serviceerr.write(stderr.decode("utf-8"))
 
+    # Error if anything was written on stderr as this may indicate ignored
+    # exceptions (e.g. ResourceWarning during garbage collection)
+    if stderr:
+        tlog("\nERROR: something was written to stderr, see "
+             "capture_stderr.log for details.")
+        success = False
+
     return success
 
 
@@ -552,6 +557,31 @@ def check_debug():
     return False
 
 
+def connect_client(luser, service):
+    # Try multiple times to connect, with an exponential backoff
+    for retry in range(5):
+        try:
+            # Skipping the retry=0 case gives an immediate first attempt
+            if retry:
+                time.sleep((2 ** retry) / 10)
+            luser.open("::1", 4000)
+            # Attempt to poll the connection, closing if unusable
+            try:
+                luser.fill_rawq()
+            except ConnectionResetError:
+                luser.close()
+                continue
+            # Short-circuit if we get this far, connection is safe to use
+            return luser
+        except ConnectionRefusedError:
+            continue
+    else:
+        # Connection retries have been exhausted, so give up
+        tlog("\nERROR: Client could not connect.\n")
+        stop_service(service)
+        sys.exit(1)
+
+
 def main():
     captures = ["", "", ""]
     lusers = [telnetlib.Telnet(), telnetlib.Telnet(), telnetlib.Telnet()]
@@ -565,7 +595,7 @@ def main():
             tlog("\nERROR: Service did not start.\n")
             sys.exit(1)
     for luser in lusers:
-        luser.open("::1", 4000)
+        connect_client(luser, service)
         luser.set_option_negotiation_callback(option_callback)
     selected_dialogue = dict(dialogue)
     if check_debug():
@@ -584,11 +614,7 @@ def main():
                 index, match, received = lusers[conversant].expect(
                     [re.compile(question.encode("utf-8"), flags=re.DOTALL)], 5)
                 captures[conversant] += received.decode("utf-8")
-            except ConnectionResetError:
-                tlog("\nERROR: Unable to connect to server.")
-                success = False
-                break
-            except EOFError:
+            except (ConnectionResetError, EOFError):
                 tlog("\nERROR: luser%s premature disconnection expecting:\n\n"
                      "%s\n\n"
                      "Check the end of capture_%s.log for received data."