Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(270)

Side by Side Diff: chrome/test/chromedriver/run_py_tests.py

Issue 18522003: Remove unnecessary host parameter in forwarder. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 #!/usr/bin/env python 1 #!/usr/bin/env python
2 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 2 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
3 # Use of this source code is governed by a BSD-style license that can be 3 # Use of this source code is governed by a BSD-style license that can be
4 # found in the LICENSE file. 4 # found in the LICENSE file.
5 5
6 """End to end tests for ChromeDriver.""" 6 """End to end tests for ChromeDriver."""
7 7
8 import base64 8 import base64
9 import optparse 9 import optparse
10 import os 10 import os
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 @staticmethod 140 @staticmethod
141 def GlobalSetUp(): 141 def GlobalSetUp():
142 ChromeDriverTest._http_server = webserver.WebServer( 142 ChromeDriverTest._http_server = webserver.WebServer(
143 chrome_paths.GetTestData()) 143 chrome_paths.GetTestData())
144 if _ANDROID_PACKAGE: 144 if _ANDROID_PACKAGE:
145 ChromeDriverTest._adb = android_commands.AndroidCommands() 145 ChromeDriverTest._adb = android_commands.AndroidCommands()
146 ChromeDriverTest._forwarder = forwarder.Forwarder(ChromeDriverTest._adb, 146 ChromeDriverTest._forwarder = forwarder.Forwarder(ChromeDriverTest._adb,
147 'Debug') 147 'Debug')
148 host_port = ChromeDriverTest._http_server._server.server_port 148 host_port = ChromeDriverTest._http_server._server.server_port
149 ChromeDriverTest._forwarder.Run( 149 ChromeDriverTest._forwarder.Run(
150 [(host_port, host_port)], valgrind_tools.BaseTool(), '127.0.0.1') 150 [(host_port, host_port)], valgrind_tools.BaseTool())
151 151
152 @staticmethod 152 @staticmethod
153 def GlobalTearDown(): 153 def GlobalTearDown():
154 if _ANDROID_PACKAGE: 154 if _ANDROID_PACKAGE:
155 forwarder.Forwarder.KillDevice(ChromeDriverTest._adb, 155 forwarder.Forwarder.KillDevice(ChromeDriverTest._adb,
156 valgrind_tools.BaseTool()) 156 valgrind_tools.BaseTool())
157 ChromeDriverTest._forwarder.Close() 157 ChromeDriverTest._forwarder.Close()
158 ChromeDriverTest._http_server.Shutdown() 158 ChromeDriverTest._http_server.Shutdown()
159 159
160 @staticmethod 160 @staticmethod
(...skipping 578 matching lines...) Expand 10 before | Expand all | Expand 10 after
739 negative_filter = _GetDesktopNegativeFilter(options.chrome_version) 739 negative_filter = _GetDesktopNegativeFilter(options.chrome_version)
740 options.filter = '*-' + ':__main__.'.join([''] + negative_filter) 740 options.filter = '*-' + ':__main__.'.join([''] + negative_filter)
741 741
742 all_tests_suite = unittest.defaultTestLoader.loadTestsFromModule( 742 all_tests_suite = unittest.defaultTestLoader.loadTestsFromModule(
743 sys.modules[__name__]) 743 sys.modules[__name__])
744 tests = unittest_util.FilterTestSuite(all_tests_suite, options.filter) 744 tests = unittest_util.FilterTestSuite(all_tests_suite, options.filter)
745 ChromeDriverTest.GlobalSetUp() 745 ChromeDriverTest.GlobalSetUp()
746 result = unittest.TextTestRunner(stream=sys.stdout, verbosity=2).run(tests) 746 result = unittest.TextTestRunner(stream=sys.stdout, verbosity=2).run(tests)
747 ChromeDriverTest.GlobalTearDown() 747 ChromeDriverTest.GlobalTearDown()
748 sys.exit(len(result.failures) + len(result.errors)) 748 sys.exit(len(result.failures) + len(result.errors))
OLDNEW
« no previous file with comments | « build/android/pylib/instrumentation/test_runner.py ('k') | chrome/test/chromedriver/test_environment.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698