Properly escape punctuation in test patterns

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

diff --git a/mudpy/tests/selftest.py b/mudpy/tests/selftest.py
index 1b2de6a..86ffe22 100644 (file)
--- a/mudpy/tests/selftest.py
+++ b/mudpy/tests/selftest.py
@@ -21,8 +21,8 @@ test_account0_setup = (
     (0, r"What would you like to do\?", "c"),
     (0, "Pick a birth gender for your new avatar:", "f"),
     (0, "Choose a name for her:", "1"),
-    (0, "What would you like to do?", "a"),
-    (0, "Whom would you like to awaken?", ""),
+    (0, r"What would you like to do\?", "a"),
+    (0, r"Whom would you like to awaken\?", ""),
 )
 
 test_account1_setup = (
@@ -33,8 +33,8 @@ test_account1_setup = (
     (1, r"What would you like to do\?", "c"),
     (1, "Pick a birth gender for your new avatar:", "m"),
     (1, "Choose a name for him:", "1"),
-    (1, "What would you like to do?", "a"),
-    (1, "Whom would you like to awaken?", ""),
+    (1, r"What would you like to do\?", "a"),
+    (1, r"Whom would you like to awaken\?", ""),
 )
 
 test_actor_appears = (
@@ -113,7 +113,7 @@ test_forbid_ansi_input = (
 
 test_escape_macros = (
     (0, '> ', "say $(red)bar$(nrm)"),
-    (1, r'says, "\$\(red\)bar\$\(nrm\)."', ""),
+    (1, r'says, "\$\(red\)bar\$\(nrm\)\."', ""),
 )
 
 test_movement = (
@@ -144,11 +144,11 @@ test_actor_disappears = (
 )
 
 test_account1_teardown = (
-    (1, "What would you like to do?", "d"),
-    (1, "Whom would you like to delete?", ""),
-    (1, "What would you like to do?", "p"),
-    (1, "permanently delete your account?", "y"),
-    (1, "Disconnecting...", ""),
+    (1, r"What would you like to do\?", "d"),
+    (1, r"Whom would you like to delete\?", ""),
+    (1, r"What would you like to do\?", "p"),
+    (1, r"permanently delete your account\?", "y"),
+    (1, r"Disconnecting\.\.\.", ""),
 )
 
 test_admin_setup = (
@@ -159,19 +159,20 @@ test_admin_setup = (
     (2, r"What would you like to do\?", "c"),
     (2, "Pick a birth gender for your new avatar:", "m"),
     (2, "Choose a name for him:", "1"),
-    (2, "What would you like to do?", "a"),
-    (2, "Whom would you like to awaken?", ""),
+    (2, r"What would you like to do\?", "a"),
+    (2, r"Whom would you like to awaken\?", ""),
 )
 
 test_preferences = (
     (0, "> ", "preferences"),
-    (0, r"prompt \x1b\[32m.*> ", "preferences prompt $(foo)"),
+    (0, r"\[32mprompt\x1b\[0m - <not set>.*> ", "preferences prompt $(foo)"),
     (0, r"\$\(foo\) ", "preferences prompt"),
     (0, r"\$\(foo\).*\$\(foo\) ", "preferences prompt $(time)>"),
-    (0, "[0-9]> ", "preferences prompt >"),
+    (0, "[0-9]> ", "preferences loglevel 0"),
+    (0, "does not exist.*> ", "preferences prompt >"),
     (2, "> ", "preferences loglevel 0"),
     (2, "> ", "preferences"),
-    (2, r"loglevel \x1b\[32m0\x1b\[0m.*> ", "preferences loglevel zero"),
+    (2, r"\[31mloglevel\x1b\[0m - 0.*> ", "preferences loglevel zero"),
     (2, r'''cannot be set to type "<class 'str'>"\..*> ''', ""),
 )
 
@@ -223,8 +224,8 @@ test_help = (
 test_abbrev = (
     (0, "> ", "h"),
     (0, r"h\[elp\].*m\[ove\].*> ", "he mo"),
-    (0, r"Move in a specific direction\..*> ", "mov north"),
-    (0, r"You exit to the north\..*> ", "m south"),
+    (0, r"Move in a specific direction\..*> ", "mov nor"),
+    (0, r"You exit to the north\..*> ", "m s"),
     (0, r"You exit to the south\..*> ", ""),
 )
 
@@ -233,7 +234,7 @@ test_reload = (
     (2, r"Reloading all code modules, configs and data\."
         r".* User admin reloaded the world\.",
      "show element account.admin"),
-    (2, 'These are the properties of the "account.admin" element.*'
+    (2, r'These are the properties of the "account\.admin" element.*'
         r'  \x1b\[32mpasshash:\r\n\x1b\[31m\$.*> ', ""),
 )
 
@@ -260,7 +261,7 @@ test_show_time = (
 test_show_files = (
     (2, "> ", "show files"),
     (2, r'These are the current files containing the universe:.*'
-        r'  \x1b\[31m\(rw\) \x1b\[32m/.*/account.yaml\x1b\[0m'
+        r'  \x1b\[31m\(rw\) \x1b\[32m/.*/account\.yaml\x1b\[0m'
         r' \x1b\[33m\[private\]\x1b\[0m.*> ', ""),
 )
 
@@ -287,14 +288,21 @@ test_show_element = (
     (2, r'These are the properties of the "mudpy\.limit" element.*'
         r'  \x1b\[32mpassword_tries: \x1b\[31m3.*> ',
      "show element actor.avatar_admin_0"),
-    (2, r'These are the properties of the "actor.avatar_admin_0" element.*'
+    (2, r'These are the properties of the "actor\.avatar_admin_0" element.*'
         r'  \x1b\[32mgender: \x1b\[31mfemale.*> ', ""),
 )
 
 test_show_result = (
     (2, "> ", "show result 12345*67890"),
     (2, r"\r\n838102050\r\n.*> ", "show result 1/0"),
-    (2, r"Your expression raised an exception.*division by zero.*> ", ""),
+    (2, r"Your expression raised an exception.*division by zero.*> ",
+     "show result mudpy"),
+    (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"Your expression raised an exception.*name 'actor' is not "
+        r"defined.*> ", ""),
 )
 
 test_show_log = (
@@ -322,17 +330,17 @@ test_log_no_errors = (
 
 final_cleanup = (
     (0, "> ", "quit"),
-    (0, "What would you like to do?", "d"),
-    (0, "Whom would you like to delete?", ""),
-    (0, "What would you like to do?", "p"),
-    (0, "permanently delete your account?", "y"),
-    (0, "Disconnecting...", ""),
+    (0, r"What would you like to do\?", "d"),
+    (0, r"Whom would you like to delete\?", ""),
+    (0, r"What would you like to do\?", "p"),
+    (0, r"permanently delete your account\?", "y"),
+    (0, r"Disconnecting\.\.\.", ""),
     (2, "> ", "quit"),
-    (2, "What would you like to do?", "d"),
-    (2, "Whom would you like to delete?", ""),
-    (2, "What would you like to do?", "p"),
-    (2, "permanently delete your account?", "y"),
-    (2, "Disconnecting...", ""),
+    (2, r"What would you like to do\?", "d"),
+    (2, r"Whom would you like to delete\?", ""),
+    (2, r"What would you like to do\?", "p"),
+    (2, r"permanently delete your account\?", "y"),
+    (2, r"Disconnecting\.\.\.", ""),
 )
 
 dialogue = (