projects
/
mudpy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Simplify multiline matching in functional tests
[mudpy.git]
/
bin
/
test
diff --git
a/bin/test
b/bin/test
index
62a6202
..
b23a227
100755
(executable)
--- a/
bin/test
+++ b/
bin/test
@@
-5,6
+5,7
@@
# to use, copy, modify, and distribute this software is granted under
# terms provided in the LICENSE file distributed with this software.
# 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
import sys
import telnetlib
import time
@@
-162,6
+163,11
@@
test_show_log = (
"[0-9]+\. The matching lines\r\nfrom [0-9]+ to [0-9]+ are:", ""),
)
"[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"),
dialogue = (
(test_account0_setup, "first account setup"),
(test_account1_setup, "second account setup"),
@@
-178,6
+184,7
@@
dialogue = (
(test_admin_restriction, "restricted admin commands"),
(test_admin_help, "admin help"),
(test_show_log, "show log"),
(test_admin_restriction, "restricted admin commands"),
(test_admin_help, "admin help"),
(test_show_log, "show log"),
+ (test_log_no_errors, "no errors logged"),
)
captures = ["", "", ""]
)
captures = ["", "", ""]
@@
-192,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(
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[
captures[conversant] += received.decode("utf-8")
try:
captures[conversant] += lusers[