X-Git-Url: https://git.ucc.asn.au/?p=uccvend-vendserver.git;a=blobdiff_plain;f=sql-edition%2Fservers%2FLATClient.py;h=ce77970f336f4a502522e884d6f401452352d5b9;hp=ffa896349b64c0162033aecdbf4321ccf799c905;hb=37123733790f1525161256cfabd1da877bf37e74;hpb=0f809e9fe2f968782622666f6fd66da3d35c29db

diff --git a/sql-edition/servers/LATClient.py b/sql-edition/servers/LATClient.py
index ffa8963..ce77970 100644
--- a/sql-edition/servers/LATClient.py
+++ b/sql-edition/servers/LATClient.py
@@ -17,22 +17,27 @@ def read_for_a_bit(rfh):
 	while 1:
 		r = select([rfh], [], [], 5.0)[0]
 		if r:
-			message = message + rfh.read(1)
+			try:
+				ch = rfh.read(1)
+			except socket.error:
+				ch = ''
+			if ch == '':
+				break
+			message = message + ch
 		else:
 			break
 	print "Received message: ", repr(message)
 	return message
 
-def write_expecting_echo(rfh, wfh, message):
+def write_and_get_response(rfh, wfh, message, expect_echo=True):
 	print "Writing message:", repr(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]
-		message = message[1:]
-	print "  --> Sent and echoed."
+	wfh.write(message+'\r\n')
+	wfh.flush()
+	print "  --> Sent"
+	response = read_for_a_bit(rfh)
+	if response.find(message) == -1 and expect_echo:
+		raise LATClientException("Talking to DEC server, expected to find original message in echo but didn't")
+	return response
 
 class LATClient:
 	def __init__(self, service = None, node = None, port = None,
@@ -93,19 +98,27 @@ class LATClient:
 		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')
-		read_for_a_bit(mopr)
-		write_expecting_echo(mopr, mopw, 'grim reaper\n')
-		read_for_a_bit(mopr)
-		write_expecting_echo(mopr, mopw, 'set priv\n')
-		read_for_a_bit(mopr)
-		write_expecting_echo(mopr, mopw, self.priv_password+'\n')
-		read_for_a_bit(mopr)
-		write_expecting_echo(mopr, mopw, 'init del 0\n')
-		read_for_a_bit(mopr)
+		write_and_get_response(mopr, mopw, '')
+		r = write_and_get_response(mopr, mopw, self.connect_password, False)
+		if r.find('Enter username> ') == -1:
+			print "Expected username prompt, got ", repr(r)
+			raise LATClientException('failed to reboot server')
+		r = write_and_get_response(mopr, mopw, 'grim reaper')
+		if r.find('Local> ') == -1:
+			print "Expected DEC server prompt, got ", repr(r)
+			raise LATClientException('failed to reboot server')
+		r = write_and_get_response(mopr, mopw, 'set priv')
+		if r.find('Password> ') == -1:
+			print "Expected priv password prompt, got ", repr(r)
+			raise LATClientException('failed to reboot server')
+		r = write_and_get_response(mopr, mopw, self.priv_password, False)
+		if r.find('Local> ') == -1:
+			print "Expected DEC server prompt, got ", repr(r)
+			raise LATClientException('failed to reboot server')
+		r = write_and_get_response(mopr, mopw, 'init del 0')
+		if r.find('Target does not respond') == -1:
+			print "Expected DEC server to die, got ", repr(r)
+			raise LATClientException('failed to reboot server')
 		mopr.close()
 		mopw.close()
 		print