From 4757f5dd320fb0f9503e73d66960d27485b48d87 Mon Sep 17 00:00:00 2001
From: Jeremy Stanley <fungi@yuggoth.org>
Date: Wed, 25 Dec 2019 23:04:20 +0000
Subject: [PATCH] Properly escape punctuation in test patterns

Make sure all literal question marks (?) and periods (.) in selftest
match patterns are backslash-escaped in raw strings.
---
 mudpy/tests/selftest.py | 52 ++++++++++++++++++++++++-------------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/mudpy/tests/selftest.py b/mudpy/tests/selftest.py
index 9c4def3..86ffe22 100644
--- 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,8 +159,8 @@ 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 = (
@@ -234,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\$.*> ', ""),
 )
 
@@ -261,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.*> ', ""),
 )
 
@@ -288,7 +288,7 @@ 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.*> ', ""),
 )
 
@@ -300,7 +300,7 @@ test_show_result = (
     (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"<mudpy\.misc\.Universe object at 0x.*> ", "show result actor"),
     (2, r"Your expression raised an exception.*name 'actor' is not "
         r"defined.*> ", ""),
 )
@@ -330,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 = (
-- 
2.11.0