Honor ANDROID_SERIAL environment variable to select device

dtmilano · dtmilano · commit dd91dd33873d · 2012-11-15T01:30:03.000-05:00
diff --git a/AndroidViewClient/src/com/dtmilano/android/viewclient.py b/AndroidViewClient/src/com/dtmilano/android/viewclient.py
@@ -915,7 +915,9 @@ def connectToDeviceOrExit(timeout=60, verbose=False, ignoresecuredevice=False):
         # eat all the extra options the invoking script may have added
         while len(sys.argv) > 1 and sys.argv[1][0] == '-':
             sys.argv.pop(1)
-        serialno = sys.argv[1] if len(sys.argv) > 1 else '.*'
+        serialno = sys.argv[1] if len(sys.argv) > 1 else \
+                os.environ['ANDROID_SERIAL'] if os.environ.has_key('ANDROID_SERIAL') \
+                else '.*'
         if verbose:
             print 'Connecting to a device with serialno=%s with a timeout of %d secs...' % (serialno, timeout)
         # Sometimes MonkeyRunner doesn't even timeout (i.e. two connections from same process), so let's
@@ -934,14 +936,14 @@ def connectToDeviceOrExit(timeout=60, verbose=False, ignoresecuredevice=False):
             device.wake()
         except java.lang.NullPointerException, e:
             print >> sys.stderr, "%s: ERROR: Couldn't connect to %s: %s" % (progname, serialno, e)
-            sys.exit(1)
+            sys.exit(3)
         if verbose:
             print 'Connected to device with serialno=%s' % serialno
         secure = device.getSystemProperty('ro.secure')
         debuggable = device.getSystemProperty('ro.debuggable')
         if secure == '1' and debuggable == '0' and not ignoresecuredevice:
             print >> sys.stderr, "%s: ERROR: Device is secure, AndroidViewClient won't work." % progname
-            sys.exit(1)
+            sys.exit(2)
         if re.search("[.*()+]", serialno):
             # if a regex was used we have to determine the serialno used
             serialno = ViewClient.__obtainDeviceSerialNumber(device)
diff --git a/AndroidViewClient/tests/com/dtmilano/android/viewclient.py b/AndroidViewClient/tests/com/dtmilano/android/viewclient.py
@@ -10,6 +10,7 @@
 import os
 import StringIO
 import unittest
+import exceptions
 
 # PyDev sets PYTHONPATH, use it
 try:
@@ -177,7 +178,15 @@ def testExceptionDeviceNotConnected(self):
             vc = ViewClient(None, None)
         except Exception, e:
             self.assertEqual('Device is not connected', e.message)
-            
+    
+    def testConnectToDeviceOrExit_environ(self):
+        sys.argv = ['']
+        os.environ['ANDROID_SERIAL'] = 'ABC123'
+        try:
+            ViewClient.connectToDeviceOrExit(verbose=True)
+        except exceptions.SystemExit, e:
+            self.assertEquals(3, e.code)
+        
     def testConstructor(self):
         device = MockDevice()
         vc = ViewClient(device, device.serialno, adb=TRUE, autodump=False)
