| OLD | NEW | 
|---|
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 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 os | 6 import os | 
| 7 import re | 7 import re | 
| 8 | 8 | 
| 9 from pylib import constants | 9 from pylib import constants | 
| 10 from pylib import pexpect | 10 from pylib import pexpect | 
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 63   def PushDataDeps(self): | 63   def PushDataDeps(self): | 
| 64     self.device.WaitUntilFullyBooted(timeout=20) | 64     self.device.WaitUntilFullyBooted(timeout=20) | 
| 65     self.tool.CopyFiles() | 65     self.tool.CopyFiles() | 
| 66     if os.path.exists(constants.ISOLATE_DEPS_DIR): | 66     if os.path.exists(constants.ISOLATE_DEPS_DIR): | 
| 67       # TODO(frankf): linux_dumper_unittest_helper needs to be in the same dir | 67       # TODO(frankf): linux_dumper_unittest_helper needs to be in the same dir | 
| 68       # as breakpad_unittests exe. Find a better way to do this. | 68       # as breakpad_unittests exe. Find a better way to do this. | 
| 69       if self.test_package.suite_name == 'breakpad_unittests': | 69       if self.test_package.suite_name == 'breakpad_unittests': | 
| 70         device_dir = constants.TEST_EXECUTABLE_DIR | 70         device_dir = constants.TEST_EXECUTABLE_DIR | 
| 71       else: | 71       else: | 
| 72         device_dir = self.device.GetExternalStoragePath() | 72         device_dir = self.device.GetExternalStoragePath() | 
| 73       self.device.PushChangedFiles( | 73       for p in os.listdir(constants.ISOLATE_DEPS_DIR): | 
| 74           [(os.path.join(constants.ISOLATE_DEPS_DIR, p), | 74         self.device.PushChangedFiles( | 
|  | 75             os.path.join(constants.ISOLATE_DEPS_DIR, p), | 
| 75             os.path.join(device_dir, p)) | 76             os.path.join(device_dir, p)) | 
| 76            for p in os.listdir(constants.ISOLATE_DEPS_DIR)]) |  | 
| 77 | 77 | 
| 78   def _ParseTestOutput(self, p): | 78   def _ParseTestOutput(self, p): | 
| 79     """Process the test output. | 79     """Process the test output. | 
| 80 | 80 | 
| 81     Args: | 81     Args: | 
| 82       p: An instance of pexpect spawn class. | 82       p: An instance of pexpect spawn class. | 
| 83 | 83 | 
| 84     Returns: | 84     Returns: | 
| 85       A TestRunResults object. | 85       A TestRunResults object. | 
| 86     """ | 86     """ | 
| (...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 189     self.tool.SetupEnvironment() | 189     self.tool.SetupEnvironment() | 
| 190 | 190 | 
| 191   #override | 191   #override | 
| 192   def TearDown(self): | 192   def TearDown(self): | 
| 193     """Cleans up the test enviroment for the test suite.""" | 193     """Cleans up the test enviroment for the test suite.""" | 
| 194     if _TestSuiteRequiresHighPerfMode(self.test_package.suite_name): | 194     if _TestSuiteRequiresHighPerfMode(self.test_package.suite_name): | 
| 195       self._perf_controller.SetDefaultPerfMode() | 195       self._perf_controller.SetDefaultPerfMode() | 
| 196     self.test_package.ClearApplicationState(self.device) | 196     self.test_package.ClearApplicationState(self.device) | 
| 197     self.tool.CleanUpEnvironment() | 197     self.tool.CleanUpEnvironment() | 
| 198     super(TestRunner, self).TearDown() | 198     super(TestRunner, self).TearDown() | 
| OLD | NEW | 
|---|