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."
self.sock.close()
mopw, mopr = popen4('/usr/sbin/moprc '+self.server_name)
read_for_a_bit(mopr)
- write_expecting_echo(mopr, mopw, '\n')
+ mopw.write('\n')
read_for_a_bit(mopr)
- write_expecting_echo(mopr, mopw, self.connect_password+'\n')
+ mopw.write(self.connect_password+'\n')
read_for_a_bit(mopr)
write_expecting_echo(mopr, mopw, 'grim reaper\n')
read_for_a_bit(mopr)