X-Git-Url: https://mudpy.org/gitweb?p=mudpy.git;a=blobdiff_plain;f=mudpy%2Ftests%2Fselftest.py;h=179871eeb6f29a482456c6d0571a0df572eaea04;hp=799ac506234844c4e44c212c3441e3dc6f6547fc;hb=7d270b507a1788a8d2b0a6f4747cf67ffdf81bee;hpb=f75bc473e2c6d7ef1954087261e1e139d200cfa4

diff --git a/mudpy/tests/selftest.py b/mudpy/tests/selftest.py
index 799ac50..179871e 100644
--- a/mudpy/tests/selftest.py
+++ b/mudpy/tests/selftest.py
@@ -158,18 +158,25 @@ test_admin_setup = (
     (2, "Whom would you like to awaken?", ""),
 )
 
+test_crlf_eol = (
+    # Send a CR+LF at the end of the line instead of the default CR+NUL,
+    # to make sure they're treated the same
+    (2, "> ", b"say I use CR+LF as my EOL, not CR+NUL.\r\n"),
+    (2, r'You say, "I use CR\+LF as my EOL, not CR\+NUL\.".*> ', ""),
+)
+
 test_telnet_iac = (
     # Send a double (escaped) IAC byte within other text, which should get
     # unescaped and deduplicated to a single \xff in the buffer and then
     # the line of input discarded as a non-ASCII sequence
-    (2, "> ", b"say argle\xff\xffbargle\r\n"),
+    (2, "> ", b"say argle\xff\xffbargle\r\0"),
     (2, r"Non-ASCII characters from admin: b'say argle\\xffbargle'.*> ", ""),
 )
 
 test_telnet_unknown = (
     # Send an unsupported negotiation command #127 which should get filtered
     # from the line of input
-    (2, "> ", b"say glop\xff\x7fglyf\r\n"),
+    (2, "> ", b"say glop\xff\x7fglyf\r\0"),
     (2, r'Unknown Telnet IAC command 127 ignored\..*"Glopglyf\.".*> ', ""),
 )
 
@@ -296,6 +303,7 @@ dialogue = (
     (test_actor_disappears, "actor spontaneous disappearance"),
     (test_account1_teardown, "second account teardown"),
     (test_admin_setup, "admin account setup"),
+    (test_crlf_eol, "send crlf from the client as eol"),
     (test_telnet_iac, "escape stray telnet iac bytes"),
     (test_telnet_unknown, "strip unknown telnet command"),
     (test_admin_restriction, "restricted admin commands"),
@@ -446,7 +454,7 @@ def main():
                 break
             if type(answer) is str:
                 tlog("luser%s sending: %s" % (conversant, answer), quiet=True)
-                lusers[conversant].write(("%s\r\n" % answer).encode("utf-8"))
+                lusers[conversant].write(("%s\r\0" % answer).encode("utf-8"))
                 captures[conversant] += "%s\r\n" % answer
             elif type(answer) is bytes:
                 tlog("luser%s sending raw bytes: %s" % (conversant, answer),