Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1093)

Side by Side Diff: build/android/pylib/instrumentation/test_runner.py

Issue 21569002: Fix call to _ForwardPorts() in test_runner.py. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 """Class for running instrumentation tests on a single device.""" 5 """Class for running instrumentation tests on a single device."""
6 6
7 import logging 7 import logging
8 import os 8 import os
9 import re 9 import re
10 import shutil 10 import shutil
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 else: 144 else:
145 if self.adb.SetJavaAssertsEnabled(enable=not self.disable_assertions): 145 if self.adb.SetJavaAssertsEnabled(enable=not self.disable_assertions):
146 self.adb.Reboot(full_reboot=False) 146 self.adb.Reboot(full_reboot=False)
147 147
148 # We give different default value to launch HTTP server based on shard index 148 # We give different default value to launch HTTP server based on shard index
149 # because it may have race condition when multiple processes are trying to 149 # because it may have race condition when multiple processes are trying to
150 # launch lighttpd with same port at same time. 150 # launch lighttpd with same port at same time.
151 http_server_ports = self.LaunchTestHttpServer( 151 http_server_ports = self.LaunchTestHttpServer(
152 os.path.join(constants.DIR_SOURCE_ROOT), self._lighttp_port) 152 os.path.join(constants.DIR_SOURCE_ROOT), self._lighttp_port)
153 if self.ports_to_forward: 153 if self.ports_to_forward:
154 self.ForwardPorts([(port, port) for port in self.ports_to_forward]) 154 self._ForwardPorts([(port, port) for port in self.ports_to_forward])
155 self.flags.AddFlags(['--enable-test-intents']) 155 self.flags.AddFlags(['--enable-test-intents'])
156 156
157 def TearDown(self): 157 def TearDown(self):
158 """Cleans up the test harness and saves outstanding data from test run.""" 158 """Cleans up the test harness and saves outstanding data from test run."""
159 if self.ports_to_forward: 159 if self.ports_to_forward:
160 self._UnmapPorts([(port, port) for port in self.ports_to_forward]) 160 self._UnmapPorts([(port, port) for port in self.ports_to_forward])
161 super(TestRunner, self).TearDown() 161 super(TestRunner, self).TearDown()
162 162
163 def TestSetup(self, test): 163 def TestSetup(self, test):
164 """Sets up the test harness for running a particular test. 164 """Sets up the test harness for running a particular test.
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after
351 duration_ms = 0 351 duration_ms = 0
352 message = str(e) 352 message = str(e)
353 if not message: 353 if not message:
354 message = 'No information.' 354 message = 'No information.'
355 results.AddResult(test_result.InstrumentationTestResult( 355 results.AddResult(test_result.InstrumentationTestResult(
356 test, base_test_result.ResultType.CRASH, start_date_ms, duration_ms, 356 test, base_test_result.ResultType.CRASH, start_date_ms, duration_ms,
357 log=message)) 357 log=message))
358 raw_result = None 358 raw_result = None
359 self.TestTeardown(test, raw_result) 359 self.TestTeardown(test, raw_result)
360 return (results, None if results.DidRunPass() else test) 360 return (results, None if results.DidRunPass() else test)
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698