diff options
| author | joaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-09 23:42:14 +0000 |
|---|---|---|
| committer | joaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-09 23:42:14 +0000 |
| commit | a2240d8ab422c3325127d8253b68ce13fbb1e3ec (patch) | |
| tree | 0bbdd045e4f3b497215ab6642569c0a65695450b /build | |
| parent | 44dc236c728b75906acccaf9eb83c35024c0a052 (diff) | |
| download | chromium_src-a2240d8ab422c3325127d8253b68ce13fbb1e3ec.zip chromium_src-a2240d8ab422c3325127d8253b68ce13fbb1e3ec.tar.gz chromium_src-a2240d8ab422c3325127d8253b68ce13fbb1e3ec.tar.bz2 | |
Avoid forwarding the test HTTP port twice.
base_test_runner.BaseTestRunner already forwards port 8000; avoid doing that
again in instrumentation.test_runner.TestRunner again, which confuses the
forwarder.
BUG=242846
Review URL: https://chromiumcodereview.appspot.com/18854020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210666 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/android/pylib/instrumentation/test_runner.py | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/build/android/pylib/instrumentation/test_runner.py b/build/android/pylib/instrumentation/test_runner.py index 29225a5..60000bf 100644 --- a/build/android/pylib/instrumentation/test_runner.py +++ b/build/android/pylib/instrumentation/test_runner.py @@ -14,7 +14,6 @@ import time from pylib import android_commands from pylib import cmd_helper from pylib import constants -from pylib import forwarder from pylib import json_perf_parser from pylib import perf_tests_helper from pylib import valgrind_tools @@ -86,7 +85,6 @@ class TestRunner(base_test_runner.BaseTestRunner): self.test_pkg = test_pkg self.ports_to_forward = ports_to_forward self.install_apk = options.install_apk - self.forwarder = None #override def InstallTestPackage(self): @@ -151,18 +149,11 @@ class TestRunner(base_test_runner.BaseTestRunner): http_server_ports = self.LaunchTestHttpServer( os.path.join(constants.DIR_SOURCE_ROOT), self._lighttp_port) if self.ports_to_forward: - port_pairs = [(port, port) for port in self.ports_to_forward] - # We need to remember which ports the HTTP server is using, since the - # forwarder will stomp on them otherwise. - port_pairs.append(http_server_ports) - self.forwarder = forwarder.Forwarder(self.adb, self.build_type) - self.forwarder.Run(port_pairs, self.tool) + self.StartForwarder([(port, port) for port in self.ports_to_forward]) self.flags.AddFlags(['--enable-test-intents']) def TearDown(self): """Cleans up the test harness and saves outstanding data from test run.""" - if self.forwarder: - self.forwarder.Close() super(TestRunner, self).TearDown() def TestSetup(self, test): |