More explicit messages if UiAutomatorHelper instrumentation is not found

dtmilano · dtmilano · commit 6e2f3bfd16bb · 2016-10-06T22:47:34.000-04:00
diff --git a/src/com/dtmilano/android/uiautomator/uiautomatorhelper.py b/src/com/dtmilano/android/uiautomator/uiautomatorhelper.py
@@ -18,7 +18,7 @@
 @author: Diego Torres Milano
 '''
 
-__version__ = '11.5.12'
+__version__ = '11.5.13'
 
 import os
 import subprocess
@@ -105,8 +105,10 @@ def __init__(self, adbclient, adb=None, localport=9999, remoteport=9999, hostnam
         self.adbClient = adbclient
         ''' The adb client (a.k.a. device) '''
         instrumentation = self.adbClient.shell('pm list instrumentation %s' % self.PACKAGE)
-        if not re.match('instrumentation:%s/%s \(target=%s\)' % (self.TEST_CLASS, self.TEST_RUNNER, self.PACKAGE), instrumentation):
+        if not instrumentation:
             raise RuntimeError('The target device does not contain the instrumentation for %s' % self.PACKAGE)
+        if not re.match('instrumentation:%s/%s \(target=%s\)' % (self.TEST_CLASS, self.TEST_RUNNER, self.PACKAGE), instrumentation):
+            raise RuntimeError('The instrumentation found for %s does not match the expected %s/%s' % (self.PACKAGE, self.TEST_CLASS, self.TEST_RUNNER))
         self.adb = self.__whichAdb(adb)
         ''' The adb command '''
         self.osName = platform.system()
