X-Git-Url: https://mudpy.org/gitweb?p=mudpy.git;a=blobdiff_plain;f=mudpy%2Ftests%2Fselftest.py;h=c0bfc3cb04eaff3443c8e872a98c8cfa824867b2;hp=bb19d331ff347f72031a432934c01e0be89c6f8c;hb=743c99fee8de7db57253daa15602bb4af6f85eda;hpb=a75fa6326ef030ad1dbbe25171c75180f93e657c diff --git a/mudpy/tests/selftest.py b/mudpy/tests/selftest.py index bb19d33..c0bfc3c 100644 --- a/mudpy/tests/selftest.py +++ b/mudpy/tests/selftest.py @@ -1,4 +1,4 @@ -# Copyright (c) 2004-2020 mudpy authors. Permission to use, copy, +# Copyright (c) 2004-2021 mudpy authors. Permission to use, copy, # modify, and distribute this software is granted under terms # provided in the LICENSE file distributed with this software. @@ -13,13 +13,6 @@ import time import yaml -# TODO(fungi) Clean this up once Python 3.5 is no longer supported -if sys.version < "3.6": - import collections - odict = collections.OrderedDict -else: - odict = dict - pidfile = "var/mudpy.pid" test_account0_setup = ( @@ -402,54 +395,54 @@ final_cleanup = ( (2, r"Disconnecting\.\.\.", ""), ) -dialogue = odict(( - (test_account0_setup, "first account setup"), - (test_account1_setup, "second account setup"), - (test_actor_appears, "actor spontaneous appearance"), - (test_explicit_punctuation, "explicit punctuation"), - (test_implicit_punctuation, "implicit punctuation"), - (test_typo_replacement, "typo replacement"), - (test_sentence_capitalization, "sentence capitalization"), - (test_chat_mode, "chat mode"), - (test_wrapping, "wrapping"), - (test_forbid_ansi_input, "raw escape input is filtered"), - (test_escape_macros, "replacement macros are escaped"), - (test_movement, "movement"), - (test_actor_disappears, "actor spontaneous disappearance"), - (test_abort_avatar_deletion, "abort avatar deletion"), - (test_avatar_creation_limit, "avatar creation limit"), - (test_avatar_deletion, "avatar deletion"), - (test_abort_account_deletion, "abort account deletion"), - (test_account_deletion, "account deletion"), - (test_admin_setup, "admin account setup"), - (test_preferences, "set and show preferences"), - (test_crlf_eol, "send crlf from the client as eol"), - (test_telnet_iac, "escape stray telnet iac bytes"), - (test_telnet_unknown_command, "strip unknown telnet command"), - (test_telnet_unknown_option, "log unknown telnet option"), - (test_admin_restriction, "restricted admin commands"), - (test_admin_help, "admin help"), - (test_help, "help command"), - (test_abbrev, "command abbreviation"), - (test_reload, "reload"), - (test_set_facet, "set facet"), - (test_set_refused, "refuse altering read-only element"), - (test_show_version, "show version and diagnostic info"), - (test_show_time, "show elapsed world clock increments"), - (test_show_files, "show a list of loaded files"), - (test_show_file, "show nodes from a specific file"), - (test_show_groups, "show groups"), - (test_show_group, "show group"), - (test_show_element, "show element"), - (test_evaluate, "show results of python expressions"), - (test_debug_restricted, "only admins can run debug commands"), - (test_debug_disabled, "debugging commands only in debug mode"), - (test_show_log, "show log"), - (test_custom_loglevel, "custom loglevel"), - (test_invalid_loglevel, "invalid loglevel"), - (test_log_no_errors, "no errors logged"), - (final_cleanup, "delete remaining accounts"), -)) +dialogue = { + test_account0_setup: "first account setup", + test_account1_setup: "second account setup", + test_actor_appears: "actor spontaneous appearance", + test_explicit_punctuation: "explicit punctuation", + test_implicit_punctuation: "implicit punctuation", + test_typo_replacement: "typo replacement", + test_sentence_capitalization: "sentence capitalization", + test_chat_mode: "chat mode", + test_wrapping: "wrapping", + test_forbid_ansi_input: "raw escape input is filtered", + test_escape_macros: "replacement macros are escaped", + test_movement: "movement", + test_actor_disappears: "actor spontaneous disappearance", + test_abort_avatar_deletion: "abort avatar deletion", + test_avatar_creation_limit: "avatar creation limit", + test_avatar_deletion: "avatar deletion", + test_abort_account_deletion: "abort account deletion", + test_account_deletion: "account deletion", + test_admin_setup: "admin account setup", + test_preferences: "set and show preferences", + test_crlf_eol: "send crlf from the client as eol", + test_telnet_iac: "escape stray telnet iac bytes", + test_telnet_unknown_command: "strip unknown telnet command", + test_telnet_unknown_option: "log unknown telnet option", + test_admin_restriction: "restricted admin commands", + test_admin_help: "admin help", + test_help: "help command", + test_abbrev: "command abbreviation", + test_reload: "reload", + test_set_facet: "set facet", + test_set_refused: "refuse altering read-only element", + test_show_version: "show version and diagnostic info", + test_show_time: "show elapsed world clock increments", + test_show_files: "show a list of loaded files", + test_show_file: "show nodes from a specific file", + test_show_groups: "show groups", + test_show_group: "show group", + test_show_element: "show element", + test_evaluate: "show results of python expressions", + test_debug_restricted: "only admins can run debug commands", + test_debug_disabled: "debugging commands only in debug mode", + test_show_log: "show log", + test_custom_loglevel: "custom loglevel", + test_invalid_loglevel: "invalid loglevel", + test_log_no_errors: "no errors logged", + final_cleanup: "delete remaining accounts", +} debug_tests = ( test_evaluate, @@ -468,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) @@ -485,7 +477,6 @@ def start_service(config): service = subprocess.Popen(("mudpy", config), stdout=subprocess.PIPE, stderr=subprocess.PIPE) - time.sleep(1) return service @@ -553,11 +544,37 @@ def option_callback(telnet_socket, command, option): def check_debug(): if len(sys.argv) > 1: - config = yaml.safe_load(open(sys.argv[1])) + with open(sys.argv[1]) as config_fd: + config = yaml.safe_load(config_fd) return config.get(".mudpy.limit.debug", False) 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()] @@ -571,9 +588,9 @@ 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 = odict(dialogue) + selected_dialogue = dict(dialogue) if check_debug(): for test in nondebug_tests: del selected_dialogue[test] @@ -590,11 +607,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."