-# Copyright (c) 2004-2019 mudpy authors. Permission to use, copy,
+# Copyright (c) 2004-2020 mudpy authors. Permission to use, copy,
# modify, and distribute this software is granted under terms
# provided in the LICENSE file distributed with this software.
import telnetlib
import time
+# 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 = (
(2, r"\r\n838102050\r\n.*> ", "show result 1/0"),
(2, r"Your expression raised an exception.*division by zero.*> ",
"show result mudpy"),
- (2, r"<module 'mudpy' from .*> ", "show result re"),
+ (2, r"<module 'mudpy' from.*> ", "show result re"),
(2, r"Your expression raised an exception.*name 're' is not defined.*> ",
"show result universe"),
(2, r"<mudpy\.misc\.Universe object at 0x.*> ", "show result actor"),
(2, r"Disconnecting\.\.\.", ""),
)
-dialogue = (
+dialogue = odict((
(test_account0_setup, "first account setup"),
(test_account1_setup, "second account setup"),
(test_actor_appears, "actor spontaneous appearance"),
(test_invalid_loglevel, "invalid loglevel"),
(test_log_no_errors, "no errors logged"),
(final_cleanup, "delete remaining accounts"),
-)
+))
def start_service(config):
# Clean up any previously run daemon which didn't terminate
if os.path.exists(pidfile):
- pidfd = open(pidfile)
- pid = int(pidfd.read())
+ with open(pidfile) as pidfd:
+ pid = int(pidfd.read())
try:
# Stop the running service
os.kill(pid, 15)
# This cleans up a daemonized and disassociated service
if os.path.exists(pidfile):
- pidfd = open(pidfile)
- pid = int(pidfd.read())
+ with open(pidfile) as pidfd:
+ pid = int(pidfd.read())
try:
# Stop the running service
os.kill(pid, 15)
# Log the contents of stdout and stderr, if any
stdout, stderr = service.communicate()
tlog("\nRecording stdout as capture_stdout.log.")
- serviceout = open("capture_stdout.log", "w")
- serviceout.write(stdout.decode("utf-8"))
+ with open("capture_stdout.log", "w") as serviceout:
+ serviceout.write(stdout.decode("utf-8"))
tlog("\nRecording stderr as capture_stderr.log.")
- serviceerr = open("capture_stderr.log", "w")
- serviceerr.write(stderr.decode("utf-8"))
+ with open("capture_stderr.log", "w") as serviceerr:
+ serviceerr.write(stderr.decode("utf-8"))
return(success)
if len(sys.argv) > 1:
# Start the service if a config file was provided on the command line
service = start_service(sys.argv[1])
+ if not service:
+ tlog("\nERROR: Service did not start.\n")
+ sys.exit(1)
for luser in lusers:
luser.open("::1", 4000)
luser.set_option_negotiation_callback(option_callback)
- for test, description in dialogue:
+ selected_dialogue = odict(dialogue)
+ for test, description in selected_dialogue.items():
tlog("\nTesting %s..." % description)
test_start = time.time()
for conversant, question, answer in test: