add more debugging to write_expecting_echo

[zanchey/dispense2.git] / sql-edition / servers / LATClient.py

diff --git a/sql-edition/servers/LATClient.py b/sql-edition/servers/LATClient.py
index ffa8963..dedc1ff 100644 (file)
--- a/sql-edition/servers/LATClient.py
+++ b/sql-edition/servers/LATClient.py
@@ -28,9 +28,14 @@ def write_expecting_echo(rfh, wfh, message):
        while len(message) > 0:
                wfh.write(message[0])
                wfh.flush()
-               echo = rfh.read(1)
-               if echo != message[0]:
-                       print "Gah, expected echo when writing", message[0]
+               if message[0] == '\n':
+                       echo = rfh.read(2)
+                       expected_echo = '\r\n'
+               else:
+                       echo = rfh.read(1)
+                       expected_echo = message[0]
+               if echo != expected_echo:
+                       print "Gah, expected echo when writing", repr(message[0]), "but got", repr(echo)
                message = message[1:]
        print "  --> Sent and echoed."