Handle early wrapping in test_show_result

[mudpy.git] / mudpy / tests / selftest.py

diff --git a/mudpy/tests/selftest.py b/mudpy/tests/selftest.py
index d9a6ee0..6e130c3 100644 (file)
--- a/mudpy/tests/selftest.py
+++ b/mudpy/tests/selftest.py
@@ -1,4 +1,4 @@
-# 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.
 
@@ -336,7 +336,7 @@ test_show_result = (
     (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"),
@@ -347,14 +347,14 @@ test_show_result = (
 test_show_log = (
     (2, "> ", "show log"),
     (2, r"There are [0-9]+ log lines in memory and [0-9]+ at or above level "
-        r"[0-9]+\. The matching lines\r\nfrom [0-9]+ to [0-9]+ are:", ""),
+        r"[0-9]+\. The matching.*from [0-9]+ to [0-9]+ are:", ""),
 )
 
 test_custom_loglevel = (
     (2, "> ", "set account.admin loglevel 2"),
     (2, "You have successfully .*> ", "show log"),
     (2, r"There are [0-9]+ log lines in memory and [0-9]+ at or above level "
-        r"[0-9]+\. The matching lines\r\nfrom [0-9]+ to [0-9]+ are:", ""),
+        r"[0-9]+\. The matching.*from [0-9]+ to [0-9]+ are:", ""),
 )
 
 test_invalid_loglevel = (
@@ -528,6 +528,9 @@ def main():
     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)