| OLD | NEW | 
|---|
| 1 # Copyright 2015 The Chromium Authors. All rights reserved. | 1 # Copyright 2015 The Chromium Authors. All rights reserved. | 
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be | 
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. | 
| 4 | 4 | 
| 5 import logging | 5 import logging | 
| 6 import re | 6 import re | 
| 7 import time | 7 import time | 
| 8 | 8 | 
| 9 from devil.android import device_errors | 9 from devil.android import device_errors | 
| 10 from pylib import flag_changer | 10 from pylib import flag_changer | 
| (...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 130     display_name = self._GetTestName(test) | 130     display_name = self._GetTestName(test) | 
| 131     flags = test['flags'] | 131     flags = test['flags'] | 
| 132     if flags.add: | 132     if flags.add: | 
| 133       display_name = '%s with {%s}' % (display_name, ' '.join(flags.add)) | 133       display_name = '%s with {%s}' % (display_name, ' '.join(flags.add)) | 
| 134     if flags.remove: | 134     if flags.remove: | 
| 135       display_name = '%s without {%s}' % (display_name, ' '.join(flags.remove)) | 135       display_name = '%s without {%s}' % (display_name, ' '.join(flags.remove)) | 
| 136     return display_name | 136     return display_name | 
| 137 | 137 | 
| 138   #override | 138   #override | 
| 139   def _RunTest(self, device, test): | 139   def _RunTest(self, device, test): | 
| 140     extras = self._test_instance.GetHttpServerEnvironmentVars() | 140     extras = {} | 
| 141 | 141 | 
| 142     flags = None | 142     flags = None | 
| 143     test_timeout_scale = None | 143     test_timeout_scale = None | 
| 144     if isinstance(test, list): | 144     if isinstance(test, list): | 
| 145       if not self._test_instance.driver_apk: | 145       if not self._test_instance.driver_apk: | 
| 146         raise Exception('driver_apk does not exist. ' | 146         raise Exception('driver_apk does not exist. ' | 
| 147                         'Please build it and try again.') | 147                         'Please build it and try again.') | 
| 148 | 148 | 
| 149       def name_and_timeout(t): | 149       def name_and_timeout(t): | 
| 150         n = self._GetTestName(t) | 150         n = self._GetTestName(t) | 
| (...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 241         timeout = v | 241         timeout = v | 
| 242         break | 242         break | 
| 243     else: | 243     else: | 
| 244       logging.warning('Using default 1 minute timeout for %s', test_name) | 244       logging.warning('Using default 1 minute timeout for %s', test_name) | 
| 245       timeout = 60 | 245       timeout = 60 | 
| 246 | 246 | 
| 247     timeout *= cls._GetTimeoutScaleFromAnnotations(annotations) | 247     timeout *= cls._GetTimeoutScaleFromAnnotations(annotations) | 
| 248 | 248 | 
| 249     return timeout | 249     return timeout | 
| 250 | 250 | 
| OLD | NEW | 
|---|