swarming: Bump python-adb to 6e66b...

appengine/third_party/python-adb/adb/filesync_protocol.py

 # Copyright 2014 Google Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #     http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ skipping 189 matching lines @@
       cmd_id, header, data = self.Read(expected_ids + finish_ids)
       yield cmd_id, header, data
       if cmd_id in finish_ids:
         break
 
   def _Flush(self):
     while self.send_buffer:
       chunk = self.send_buffer[:self.adb.max_packet_size]
       try:
         self.adb.Write(chunk)
+        # Wait for ack from device, ignoring these for too long causes things
+        # to explode.
+        self.adb.ReadUntil('OKAY')
       except libusb1.USBError as e:
         self.send_buffer = ''
         raise usb_exceptions.WriteFailedError('Could not write %r' % chunk, e)
       self.send_buffer = self.send_buffer[self.adb.max_packet_size:]
 
   def _ReadBuffered(self, size):
     # Ensure recv buffer has enough data.
     while len(self.recv_buffer) < size:
       try:
-        _, data = self.adb.ReadUntil('WRTE')
+        msg = self.adb.ReadUntil('WRTE')
       except adb_protocol.InvalidResponseError as e:
         raise usb_exceptions.AdbCommandFailureException(
           'Command failed: %s' % e)
-      self.recv_buffer += data
+      self.recv_buffer += msg.data
 
     result = self.recv_buffer[:size]
     self.recv_buffer = self.recv_buffer[size:]
     return result
 
   @classmethod
   def _VerifyReplyCommand(cls, header, expected_ids):
     # Header is (ID, ...).
     command_id = adb_protocol.Wire2ID(header[0])
     if command_id not in cls._VALID_IDS:
       raise usb_exceptions.AdbCommandFailureException(
           'Command failed; incorrect header: %s' % header)
     if command_id not in expected_ids:
       if command_id == 'FAIL':
         raise usb_exceptions.AdbCommandFailureException('Command failed.')
       raise adb_protocol.InvalidResponseError(
           'Expected one of %s, got %s' % (expected_ids, command_id))
     return command_id