summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xchrome/test/chromedriver/run_py_tests.py1
-rw-r--r--chrome/test/chromedriver/test_environment.py1
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),