NaCl cleanup: Stop connecting to the SRPC trusted command channel

chrome/test/data/nacl/gdb_rsp.py

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # This file is based on gdb_rsp.py file from NaCl repository.
 
 import re
 import socket
 import time
 
 
 def RspChecksum(data):
   checksum = 0
   for char in data:
     checksum = (checksum + ord(char)) % 0x100
   return checksum
 
 
+class EofOnReplyException(Exception):
+

[bradn, 2015/06/11 19:51:59]

extra line?

[Mark Seaborn, 2015/06/11 20:05:11]

Well, it's consistent with "One blank line between method definitions and
between the class line and the first method."
(https://google-styleguide.googlecode.com/svn/trunk/pyguide.html?showone=Namin...)

+  pass
+
+
 class GdbRspConnection(object):
 
   def __init__(self, addr):
     self._socket = self._Connect(addr)
 
   def _Connect(self, addr):
     # We have to poll because we do not know when sel_ldr has
     # successfully done bind() on the TCP port.  This is inherently
     # unreliable.
     # TODO(mseaborn): Add a more reliable connection mechanism to
@@ skipping 11 matching lines @@
       else:
         return sock
     raise Exception('Could not connect to sel_ldr\'s debug stub in %i seconds'
                     % timeout_in_seconds)
 
   def _GetReply(self):
     reply = ''
     while True:
       data = self._socket.recv(1024)
       if len(data) == 0:
+        if reply == '+':
+          raise EofOnReplyException()
         raise AssertionError('EOF on socket reached with '
                              'incomplete reply message: %r' % reply)
       reply += data
       if '#' in data:
         break
     match = re.match('\+\$([^#]*)#([0-9a-fA-F]{2})$', reply)
     if match is None:
       raise AssertionError('Unexpected reply message: %r' % reply)
     reply_body = match.group(1)
     checksum = match.group(2)
@@ skipping 10 matching lines @@
     msg = '$%s#%02x' % (data, RspChecksum(data))
     return self._socket.send(msg)
 
   def RspRequest(self, data):
     self.RspSendOnly(data)
     return self._GetReply()
 
   def RspInterrupt(self):
     self._socket.send('\x03')
     return self._GetReply()