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 android_commands | 9 from pylib import android_commands |
10 from pylib import constants | 10 from pylib import constants |
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
176 retry = ':'.join([t.GetName() for t in test_results.GetNotPass()]) | 176 retry = ':'.join([t.GetName() for t in test_results.GetNotPass()]) |
177 return test_results, retry | 177 return test_results, retry |
178 | 178 |
179 #override | 179 #override |
180 def SetUp(self): | 180 def SetUp(self): |
181 """Sets up necessary test enviroment for the test suite.""" | 181 """Sets up necessary test enviroment for the test suite.""" |
182 super(TestRunner, self).SetUp() | 182 super(TestRunner, self).SetUp() |
183 if _TestSuiteRequiresMockTestServer(self.test_package.suite_name): | 183 if _TestSuiteRequiresMockTestServer(self.test_package.suite_name): |
184 self.LaunchChromeTestServerSpawner() | 184 self.LaunchChromeTestServerSpawner() |
185 self.tool.SetupEnvironment() | 185 self.tool.SetupEnvironment() |
186 self.adb.RunShellCommand('rm -r /sdcard/content_shell', timeout_time=60 * 2) | |
frankf
2013/07/31 22:12:30
As a follow up, can you address: crbug.com/251023
frankf
2013/07/31 22:12:30
Use adb.GetExternalStorage
frankf
2013/07/31 22:12:30
Makes more sense to be in TearDown
craigdh
2013/07/31 22:49:04
Done.
craigdh
2013/07/31 22:49:04
Done.
| |
186 | 187 |
187 #override | 188 #override |
188 def TearDown(self): | 189 def TearDown(self): |
189 """Cleans up the test enviroment for the test suite.""" | 190 """Cleans up the test enviroment for the test suite.""" |
190 self.tool.CleanUpEnvironment() | 191 self.tool.CleanUpEnvironment() |
191 super(TestRunner, self).TearDown() | 192 super(TestRunner, self).TearDown() |
OLD | NEW |