Skip to content

GitLab

T
tangled
Commit c251db98 authored by Tricia Crichton's avatar Tricia Crichton Committed by Commit Bot
Browse files
Options

[ChromeDriver] fix testEagerMode on Android 

Eager Mode test requires different driver capabilities than other
ChromeDriverTest methods. Creating a second driver causes the test to
fail when run on Android. Moved the test to a new class with no
default setup to enable a custom setup without failing on  Android.

Bug: chromedriver:3016
Change-Id: I8dcbc267328a18bd75e91db8b04383834da49d0e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1761609
Commit-Queue: Tricia Crichton <triciac@chromium.org>
Reviewed-by: default avatarJohn Chen <johnchen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#688750}
parent 12042bbd
Hide whitespace changes
Inline Side-by-side
Showing with 42 additions and 44 deletions
chrome/test/chromedriver/test/run_py_tests.py
View file @ c251db98
......@@ -378,9 +378,22 @@ class ChromeDriverBaseTestWithWebServer(ChromeDriverBaseTest):
def GlobalSetUp():
ChromeDriverBaseTestWithWebServer._http_server = webserver.WebServer(
chrome_paths.GetTestData())
ChromeDriverBaseTestWithWebServer._sync_server = webserver.SyncWebServer()
if _ANDROID_PACKAGE_KEY:
ChromeDriverBaseTestWithWebServer._device = (
device_utils.DeviceUtils.HealthyDevices()[0])
http_host_port = (
ChromeDriverBaseTestWithWebServer._http_server._server.server_port)
sync_host_port = (
ChromeDriverBaseTestWithWebServer._sync_server._server.server_port)
forwarder.Forwarder.Map(
[(http_host_port, http_host_port), (sync_host_port, sync_host_port)],
ChromeDriverBaseTestWithWebServer._device)
@staticmethod
def GlobalTearDown():
if _ANDROID_PACKAGE_KEY:
forwarder.Forwarder.UnmapAllDevicePorts(ChromeDriverTest._device)
ChromeDriverBaseTestWithWebServer._http_server.Shutdown()
@staticmethod
......@@ -388,26 +401,35 @@ class ChromeDriverBaseTestWithWebServer(ChromeDriverBaseTest):
return ChromeDriverBaseTestWithWebServer._http_server.GetUrl() + file_path
class ChromeDriverTest(ChromeDriverBaseTestWithWebServer):
"""End to end tests for ChromeDriver."""
class ChromeDriverTestWithCustomCapability(ChromeDriverBaseTestWithWebServer):
@staticmethod
def GlobalSetUp():
ChromeDriverBaseTestWithWebServer.GlobalSetUp()
ChromeDriverTest._sync_server = webserver.SyncWebServer()
if _ANDROID_PACKAGE_KEY:
ChromeDriverTest._device = device_utils.DeviceUtils.HealthyDevices()[0]
http_host_port = ChromeDriverTest._http_server._server.server_port
sync_host_port = ChromeDriverTest._sync_server._server.server_port
forwarder.Forwarder.Map(
[(http_host_port, http_host_port), (sync_host_port, sync_host_port)],
ChromeDriverTest._device)
def testEagerMode(self):
send_response = threading.Event()
def waitAndRespond():
send_response.wait(10)
self._sync_server.RespondWithContent('#')
thread = threading.Thread(target=waitAndRespond)
@staticmethod
def GlobalTearDown():
if _ANDROID_PACKAGE_KEY:
forwarder.Forwarder.UnmapAllDevicePorts(ChromeDriverTest._device)
ChromeDriverBaseTestWithWebServer.GlobalTearDown()
self._http_server.SetDataForPath('/top.html',
"""
<html><body>
<div id='top'>
<img src='%s'>
</div>
</body></html>""" % self._sync_server.GetUrl())
eager_driver = self.CreateDriver(page_load_strategy='eager')
thread.start()
start_eager = time.time()
eager_driver.Load(self._http_server.GetUrl() + '/top.html')
stop_eager = time.time()
send_response.set()
eager_time = stop_eager - start_eager
self.assertTrue(eager_time < 9)
thread.join()
class ChromeDriverTest(ChromeDriverBaseTestWithWebServer):
"""End to end tests for ChromeDriver."""
def setUp(self):
self._driver = self.CreateDriver()
......@@ -1049,30 +1071,6 @@ class ChromeDriverTest(ChromeDriverBaseTestWithWebServer):
self.assertEquals('normal',
self._driver.capabilities['pageLoadStrategy'])
def testEagerMode(self):
send_response = threading.Event()
def waitAndRespond():
send_response.wait(10)
self._sync_server.RespondWithContent('#')
thread = threading.Thread(target=waitAndRespond)
self._http_server.SetDataForPath('/top.html',
"""
<html><body>
<div id='top'>
<img src='%s'>
</div>
</body></html>""" % self._sync_server.GetUrl())
eager_driver = self.CreateDriver(page_load_strategy='eager')
thread.start()
start_eager = time.time()
eager_driver.Load(self._http_server.GetUrl() + '/top.html')
stop_eager = time.time()
send_response.set()
eager_time = stop_eager - start_eager
self.assertTrue(eager_time < 9)
thread.join()
def testClearElement(self):
self._driver.Load(self.GetHttpUrlForFile('/chromedriver/empty.html'))
text = self._driver.ExecuteScript(
......@@ -3892,12 +3890,12 @@ if __name__ == '__main__':
# TODO(johnchen@chromium.org): Investigate feasibility of combining
# multiple GlobalSetup and GlobalTearDown, and reducing the number of HTTP
# servers used for the test.
ChromeDriverTest.GlobalSetUp()
ChromeDriverBaseTestWithWebServer.GlobalSetUp()
ChromeDriverSecureContextTest.GlobalSetUp()
HeadlessInvalidCertificateTest.GlobalSetUp()
MobileEmulationCapabilityTest.GlobalSetUp()
result = unittest.TextTestRunner(stream=sys.stdout, verbosity=2).run(tests)
ChromeDriverTest.GlobalTearDown()
ChromeDriverBaseTestWithWebServer.GlobalTearDown()
ChromeDriverSecureContextTest.GlobalTearDown()
HeadlessInvalidCertificateTest.GlobalTearDown()
MobileEmulationCapabilityTest.GlobalTearDown()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment