DeviceUtils: Make Install and PushChangedFiles respect instance retries / timeout

build/android/devil/android/decorators_test.py

 # 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 decorators.py.
 """
 
 # pylint: disable=W0613
 
@@ skipping 205 matching lines @@
       raise device_errors.CommandFailedError('testCommand failed')
 
     # pylint: disable=no-self-use
 
     @decorators.WithTimeoutAndRetriesFromInstance(
         'default_timeout', 'default_retries')
     def alwaysReturnsTimeout(self, timeout=None, retries=None):
       return timeout
 
     @decorators.WithTimeoutAndRetriesFromInstance(
+        'default_timeout', 'default_retries', min_default_timeout=100)
+    def alwaysReturnsTimeoutWithMin(self, timeout=None, retries=None):
+      return timeout
+
+    @decorators.WithTimeoutAndRetriesFromInstance(
         'default_timeout', 'default_retries')
     def alwaysReturnsRetries(self, timeout=None, retries=None):
       return retries
 
     @decorators.WithTimeoutAndRetriesFromInstance(
         'default_timeout', 'default_retries')
     def alwaysRaisesProvidedException(self, exception, timeout=None,
                                       retries=None):
       raise exception
 
@@ skipping 28 matching lines @@
 
   def testMethodDecoratorPassesValues(self):
     """Tests that the method decorator passes timeout and retries kwargs."""
     test_obj = self._MethodDecoratorTestObject(
         self, default_timeout=42, default_retries=31)
     self.assertEquals(42, test_obj.alwaysReturnsTimeout())
     self.assertEquals(41, test_obj.alwaysReturnsTimeout(timeout=41))
     self.assertEquals(31, test_obj.alwaysReturnsRetries())
     self.assertEquals(32, test_obj.alwaysReturnsRetries(retries=32))
 
+  def testMethodDecoratorUsesMiniumumTimeout(self):
+    test_obj = self._MethodDecoratorTestObject(
+        self, default_timeout=42, default_retries=31)
+    self.assertEquals(100, test_obj.alwaysReturnsTimeoutWithMin())
+    self.assertEquals(41, test_obj.alwaysReturnsTimeoutWithMin(timeout=41))
+
   def testMethodDecoratorTranslatesReraiserExceptions(self):
     test_obj = self._MethodDecoratorTestObject(self)
 
     exception_desc = 'Reraiser thread timeout error'
     with self.assertRaises(device_errors.CommandTimeoutError) as e:
       test_obj.alwaysRaisesProvidedException(
           reraiser_thread.TimeoutError(exception_desc))
     self.assertEquals(exception_desc, str(e.exception))
 
 if __name__ == '__main__':
   unittest.main(verbosity=2)