OLD | NEW |
1 #!/usr/bin/python | |
2 # Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. |
3 # 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 |
4 # found in the LICENSE file. | 3 # found in the LICENSE file. |
5 | 4 |
6 import logging | 5 import logging |
7 import os | 6 import os |
8 | 7 |
9 import android_commands | 8 import android_commands |
10 from chrome_test_server_spawner import SpawningServer | 9 from chrome_test_server_spawner import SpawningServer |
11 from flag_changer import FlagChanger | 10 from flag_changer import FlagChanger |
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
138 """Launches test server spawner.""" | 137 """Launches test server spawner.""" |
139 self._spawning_server = SpawningServer(TEST_SERVER_SPAWNER_PORT, | 138 self._spawning_server = SpawningServer(TEST_SERVER_SPAWNER_PORT, |
140 TEST_SERVER_PORT) | 139 TEST_SERVER_PORT) |
141 self._spawning_server.Start() | 140 self._spawning_server.Start() |
142 # TODO(yfriedman): Ideally we'll only try to start up a port forwarder if | 141 # TODO(yfriedman): Ideally we'll only try to start up a port forwarder if |
143 # there isn't one already running but for now we just get an error message | 142 # there isn't one already running but for now we just get an error message |
144 # and the existing forwarder still works. | 143 # and the existing forwarder still works. |
145 self._spawner_forwarder = run_tests_helper.ForwardDevicePorts( | 144 self._spawner_forwarder = run_tests_helper.ForwardDevicePorts( |
146 self.adb, [(TEST_SERVER_SPAWNER_PORT, TEST_SERVER_SPAWNER_PORT), | 145 self.adb, [(TEST_SERVER_SPAWNER_PORT, TEST_SERVER_SPAWNER_PORT), |
147 (TEST_SERVER_PORT, TEST_SERVER_PORT)]) | 146 (TEST_SERVER_PORT, TEST_SERVER_PORT)]) |
OLD | NEW |