diff options
| author | frankf@chromium.org <frankf@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-11 20:55:17 +0000 |
|---|---|---|
| committer | frankf@chromium.org <frankf@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-11 20:55:17 +0000 |
| commit | 4383f4c3325bb1e11f6f230308ccd2adccff4621 (patch) | |
| tree | bb660fd92a9d6054329c5ba47cc8e97a5e5638a2 | |
| parent | 44ba0c0dfa84d3603e82aa1f16d52ab10ec0b5df (diff) | |
| download | chromium_src-4383f4c3325bb1e11f6f230308ccd2adccff4621.zip chromium_src-4383f4c3325bb1e11f6f230308ccd2adccff4621.tar.gz chromium_src-4383f4c3325bb1e11f6f230308ccd2adccff4621.tar.bz2 | |
[chromedriver] Kill host forwarder daemon during setup.
BUG=242846
NOTRY=True
Review URL: https://chromiumcodereview.appspot.com/19063002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@211211 0039d316-1c4b-4281-b951-d872f2087c98
| -rwxr-xr-x | chrome/test/chromedriver/run_py_tests.py | 1 | ||||
| -rw-r--r-- | chrome/test/chromedriver/test_environment.py | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/chrome/test/chromedriver/run_py_tests.py b/chrome/test/chromedriver/run_py_tests.py index 440a3fb..c7aa7ee 100755 --- a/chrome/test/chromedriver/run_py_tests.py +++ b/chrome/test/chromedriver/run_py_tests.py @@ -143,6 +143,7 @@ class ChromeDriverTest(ChromeDriverBaseTest): chrome_paths.GetTestData()) if _ANDROID_PACKAGE: ChromeDriverTest._adb = android_commands.AndroidCommands() + forwarder.Forwarder.KillHost('Debug') ChromeDriverTest._forwarder = forwarder.Forwarder(ChromeDriverTest._adb, 'Debug') host_port = ChromeDriverTest._http_server._server.server_port diff --git a/chrome/test/chromedriver/test_environment.py b/chrome/test/chromedriver/test_environment.py index e34b4c8..ebcbd0f 100644 --- a/chrome/test/chromedriver/test_environment.py +++ b/chrome/test/chromedriver/test_environment.py @@ -94,6 +94,7 @@ class AndroidTestEnvironment(DesktopTestEnvironment): os.putenv('TEST_HTTP_PORT', str(ANDROID_TEST_HTTP_PORT)) os.putenv('TEST_HTTPS_PORT', str(ANDROID_TEST_HTTPS_PORT)) self._adb = android_commands.AndroidCommands() + forwarder.Forwarder.KillHost('Debug') self._forwarder = forwarder.Forwarder(self._adb, 'Debug') self._forwarder.Run( [(ANDROID_TEST_HTTP_PORT, ANDROID_TEST_HTTP_PORT), |