git.ucc.asn.au
/
uccvend-vendserver.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add more debugging to write_expecting_echo
[uccvend-vendserver.git]
/
sql-edition
/
servers
/
LATClient.py
diff --git
a/sql-edition/servers/LATClient.py
b/sql-edition/servers/LATClient.py
index
fa2b297
..
dedc1ff
100644
(file)
--- a/
sql-edition/servers/LATClient.py
+++ b/
sql-edition/servers/LATClient.py
@@
-20,17
+20,22
@@
def read_for_a_bit(rfh):
message = message + rfh.read(1)
else:
break
message = message + rfh.read(1)
else:
break
- print "Received message: ",
message
+ print "Received message: ",
repr(message)
return message
def write_expecting_echo(rfh, wfh, message):
return message
def write_expecting_echo(rfh, wfh, message):
- print "Writing message:",
message
+ print "Writing message:",
repr(message)
while len(message) > 0:
wfh.write(message[0])
wfh.flush()
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."
message = message[1:]
print " --> Sent and echoed."
@@
-93,6
+98,7
@@
class LATClient:
self.sock.shutdown(2)
self.sock.close()
mopw, mopr = popen4('/usr/sbin/moprc '+self.server_name)
self.sock.shutdown(2)
self.sock.close()
mopw, mopr = popen4('/usr/sbin/moprc '+self.server_name)
+ read_for_a_bit(mopr)
write_expecting_echo(mopr, mopw, '\n')
read_for_a_bit(mopr)
write_expecting_echo(mopr, mopw, self.connect_password+'\n')
write_expecting_echo(mopr, mopw, '\n')
read_for_a_bit(mopr)
write_expecting_echo(mopr, mopw, self.connect_password+'\n')
UCC
git Repository :: git.ucc.asn.au