[Android] Don't use zip pushing if not built or on user builds.

build/android/pylib/device/device_utils_test.py

 #!/usr/bin/env python
 # Copyright 2014 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.
 
 """
 Unit tests for the contents of device_utils.py (mostly DeviceUtils).
 """
 
 # pylint: disable=C0321
@@ skipping 270 matching lines @@
   def testEnableRoot_rootFails(self):
     with self.assertCallsSequence([
         ('adb -s 0123456789abcdef shell getprop ro.build.type',
          'userdebug\r\n'),
         ('adb -s 0123456789abcdef root', 'no\r\n'),
         ('adb -s 0123456789abcdef wait-for-device', '')]):
       with self.assertRaises(device_errors.CommandFailedError):
         self.device.EnableRoot()
 
 
+class DeviceUtilsIsUserBuildTest(DeviceUtilsOldImplTest):
+
+  def testIsUserBuild_yes(self):
+    with self.assertCalls(
+        'adb -s 0123456789abcdef shell getprop ro.build.type',
+        'user\r\n'):
+      self.assertTrue(self.device.IsUserBuild())
+
+  def testIsUserBuild_no(self):
+    with self.assertCalls(
+        'adb -s 0123456789abcdef shell getprop ro.build.type',
+        'userdebug\r\n'):
+      self.assertFalse(self.device.IsUserBuild())
+
+
 class DeviceUtilsGetExternalStoragePathTest(DeviceUtilsOldImplTest):
 
   def testGetExternalStoragePath_succeeds(self):
     fakeStoragePath = '/fake/storage/path'
     with self.assertCalls(
         "adb -s 0123456789abcdef shell 'echo $EXTERNAL_STORAGE'",
         '%s\r\n' % fakeStoragePath):
       self.assertEquals(fakeStoragePath,
                         self.device.GetExternalStoragePath())
 
@@ skipping 588 matching lines @@
         ('/test/host/path/file1', '/test/device/path/file1'),
         ('/test/host/path/file2', '/test/device/path/file2')]
     self.device._PushChangedFilesIndividually(test_files)
     self.assertEqual(2, self.adb.Push.call_count)
     self.adb.Push.assert_any_call(
         '/test/host/path/file1', '/test/device/path/file1')
     self.adb.Push.assert_any_call(
         '/test/host/path/file2', '/test/device/path/file2')
 
 
+@mock.patch('pylib.device.commands.install_commands.Installed', new=None)
+@mock.patch('pylib.device.commands.install_commands.InstallCommands', new=None)
 class DeviceUtilsPushChangedFilesZippedTest(DeviceUtilsHybridImplTest):
 
   def setUp(self):
     super(DeviceUtilsPushChangedFilesZippedTest, self).setUp()
-    self.original_install_commands = self.device._InstallCommands
-    self.device._InstallCommands = mock.Mock()
 
   def testPushChangedFilesZipped_empty(self):
     test_files = []
     self.device._PushChangedFilesZipped(test_files)
     self.assertEqual(0, self.adb.Push.call_count)
 
   def testPushChangedFilesZipped_single(self):
     test_files = [('/test/host/path/file1', '/test/device/path/file1')]
 
     self.device._GetExternalStoragePathImpl = mock.Mock(
@@ skipping 596 matching lines @@
     self.device = device_utils.DeviceUtils(None)
     with self.assertCalls('adb  get-serialno', 'unknown'), (
          self.assertRaises(device_errors.NoDevicesError)):
       str(self.device)
 
 
 if __name__ == '__main__':
   logging.getLogger().setLevel(logging.DEBUG)
   unittest.main(verbosity=2)