X-Git-Url: https://mudpy.org/gitweb?p=mudpy.git;a=blobdiff_plain;f=bin%2Ftest;h=b23a227c1fef6910fdddb2776bb2eb64ed109012;hp=6311dc5e7282381ba70487c3b957d6303a727eac;hb=78cc0c7ed13415ba264d89bdccb3c55c4e08f536;hpb=8e982a66729335824d8e2fe898ff5ec47b1587c4

diff --git a/bin/test b/bin/test
index 6311dc5..b23a227 100755
--- a/bin/test
+++ b/bin/test
@@ -1,10 +1,11 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """Regression test script for the mudpy engine."""
 
-# Copyright (c) 2004-2015 Jeremy Stanley <fungi@yuggoth.org>. Permission
+# Copyright (c) 2004-2016 Jeremy Stanley <fungi@yuggoth.org>. Permission
 # to use, copy, modify, and distribute this software is granted under
 # terms provided in the LICENSE file distributed with this software.
 
+import re
 import sys
 import telnetlib
 import time
@@ -156,6 +157,17 @@ test_admin_help = (
     (2, "This will save all active accounts", ""),
 )
 
+test_show_log = (
+    (2, "> ", "show log"),
+    (2, "There are [0-9]+ log lines in memory and [0-9]+ at or above level "
+        "[0-9]+\. The matching lines\r\nfrom [0-9]+ to [0-9]+ are:", ""),
+)
+
+test_log_no_errors = (
+    (2, "> ", "show log 7"),
+    (2, "None of the [0-9]+ lines in memory matches your request\.", ""),
+)
+
 dialogue = (
     (test_account0_setup, "first account setup"),
     (test_account1_setup, "second account setup"),
@@ -171,6 +183,8 @@ dialogue = (
     (test_admin_setup, "admin account setup"),
     (test_admin_restriction, "restricted admin commands"),
     (test_admin_help, "admin help"),
+    (test_show_log, "show log"),
+    (test_log_no_errors, "no errors logged"),
 )
 
 captures = ["", "", ""]
@@ -185,7 +199,7 @@ for test, description in dialogue:
     for conversant, question, answer in test:
         print("luser%s waiting for: %s" % (conversant, question))
         index, match, received = lusers[conversant].expect(
-            [question.encode("utf-8")], 5)
+            [re.compile(question.encode("utf-8"), flags=re.DOTALL)], 5)
         captures[conversant] += received.decode("utf-8")
         try:
             captures[conversant] += lusers[