Raise exception if screencap fails

dtmilano · dtmilano · commit b0f94b235cb5 · 2016-07-18T13:31:04.000-04:00
diff --git a/src/com/dtmilano/android/adb/adbclient.py b/src/com/dtmilano/android/adb/adbclient.py
@@ -18,7 +18,7 @@
 '''
 import threading
 
-__version__ = '11.5.9'
+__version__ = '11.5.10'
 
 import sys
 import warnings
@@ -691,13 +691,16 @@ def takeSnapshot(self, reconnect=False):
         else:
             # ALTERNATIVE_METHOD: screencap
             received = self.shell('/system/bin/screencap -p').replace("\r\n", "\n")
+            if not received:
+                raise RuntimeError('"/system/bin/screencap -p" result was empty')
             stream = StringIO.StringIO(received)
             try:
                 image = Image.open(stream)
             except IOError, ex:
                 print >> sys.stderr, ex
-                print repr(stream)
-                sys.exit(1)
+                print >> sys.stderr, repr(stream)
+                print >> sys.stderr, repr(received)
+                raise RuntimeError('Cannot convert stream to image: ' + ex)
 
         # Just in case let's get the real image size
         (w, h) = image.size
