| 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 | 7 |
| 8 import android_commands | 8 import android_commands |
| 9 from chrome_test_server_spawner import SpawningServer | 9 from chrome_test_server_spawner import SpawningServer |
| 10 from flag_changer import FlagChanger | 10 from flag_changer import FlagChanger |
| (...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 153 """Launches test server spawner.""" | 153 """Launches test server spawner.""" |
| 154 self._spawning_server = SpawningServer(TEST_SERVER_SPAWNER_PORT, | 154 self._spawning_server = SpawningServer(TEST_SERVER_SPAWNER_PORT, |
| 155 TEST_SERVER_PORT) | 155 TEST_SERVER_PORT) |
| 156 self._spawning_server.Start() | 156 self._spawning_server.Start() |
| 157 # TODO(yfriedman): Ideally we'll only try to start up a port forwarder if | 157 # TODO(yfriedman): Ideally we'll only try to start up a port forwarder if |
| 158 # there isn't one already running but for now we just get an error message | 158 # there isn't one already running but for now we just get an error message |
| 159 # and the existing forwarder still works. | 159 # and the existing forwarder still works. |
| 160 self._spawner_forwarder = run_tests_helper.ForwardDevicePorts( | 160 self._spawner_forwarder = run_tests_helper.ForwardDevicePorts( |
| 161 self.adb, [(TEST_SERVER_SPAWNER_PORT, TEST_SERVER_SPAWNER_PORT), | 161 self.adb, [(TEST_SERVER_SPAWNER_PORT, TEST_SERVER_SPAWNER_PORT), |
| 162 (TEST_SERVER_PORT, TEST_SERVER_PORT)]) | 162 (TEST_SERVER_PORT, TEST_SERVER_PORT)]) |
| OLD | NEW |