Commit ceb5764f authored by John Chen's avatar John Chen Committed by Commit Bot

Revert "[ChromeDriver] Debug for page load timeout tests"

This reverts commit 60ef2364.

Reason for revert: Issue chromedriver:2407 resolved, extra debugging output no longer needed.

Original change's description:
> [ChromeDriver] Debug for page load timeout tests
> 
> Some page load timeout tests are currently flaky on Mac. Adding some
> debugging output to help diagnose this issue.
> 
> Bug: chromedriver:2407
> Change-Id: Ic16074e77e2b100ea3f9d104bf9eef4599f78b6b
> Reviewed-on: https://chromium-review.googlesource.com/1036592
> Reviewed-by: Jonathon Kereliuk <kereliuk@chromium.org>
> Commit-Queue: John Chen <johnchen@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#555419}

TBR=johnchen@chromium.org,kereliuk@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: chromedriver:2407
Change-Id: Ifa8c86e3a10b11b95eef4144584e1508de0d4a37
Reviewed-on: https://chromium-review.googlesource.com/1047545Reviewed-by: default avatarJohn Chen <johnchen@chromium.org>
Commit-Queue: John Chen <johnchen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#556463}
parent cd12c417
...@@ -1702,28 +1702,18 @@ class ChromeDriverSiteIsolation(ChromeDriverBaseTestWithWebServer): ...@@ -1702,28 +1702,18 @@ class ChromeDriverSiteIsolation(ChromeDriverBaseTestWithWebServer):
self.assertTrue(frame_url.endswith('#two')) self.assertTrue(frame_url.endswith('#two'))
def log(message):
# Log a message with timestamp, in a format similar to ChromeDriver log
print '[%.3f] %s' % (time.time(), message)
class ChromeDriverPageLoadTimeoutTest(ChromeDriverBaseTestWithWebServer): class ChromeDriverPageLoadTimeoutTest(ChromeDriverBaseTestWithWebServer):
class _RequestHandler(object): class _RequestHandler(object):
def __init__(self): def __init__(self):
self.request_received_event = threading.Event() self.request_received_event = threading.Event()
self.send_response_event = threading.Event() self.send_response_event = threading.Event()
print
log('Created _RequestHandler')
def handle(self, request): def handle(self, request):
log('Request received')
self.request_received_event.set() self.request_received_event.set()
log('After request_received_event.set()')
# Don't hang infinitely, 10 seconds are enough. # Don't hang infinitely, 10 seconds are enough.
self.send_response_event.wait(10) self.send_response_event.wait(10)
log('After send_response_event.wait(10)')
self.send_response_event.clear() self.send_response_event.clear()
log('After send_response_event.clear()')
return {'Cache-Control': 'no-store'}, 'Hi!' return {'Cache-Control': 'no-store'}, 'Hi!'
def setUp(self): def setUp(self):
...@@ -1740,16 +1730,13 @@ class ChromeDriverPageLoadTimeoutTest(ChromeDriverBaseTestWithWebServer): ...@@ -1740,16 +1730,13 @@ class ChromeDriverPageLoadTimeoutTest(ChromeDriverBaseTestWithWebServer):
# on Mac. So we use longer timeout on Mac, 0.5 second on others. # on Mac. So we use longer timeout on Mac, 0.5 second on others.
timeout = 3000 if util.GetPlatformName() == 'mac' else 500 timeout = 3000 if util.GetPlatformName() == 'mac' else 500
self._driver.SetTimeout('page load', timeout) self._driver.SetTimeout('page load', timeout)
log('setUp complete')
def tearDown(self): def tearDown(self):
super(ChromeDriverPageLoadTimeoutTest, self).tearDown() super(ChromeDriverPageLoadTimeoutTest, self).tearDown()
self._http_server.SetCallbackForPath('/hang', None) self._http_server.SetCallbackForPath('/hang', None)
def _LoadHangingUrl(self, host=None): def _LoadHangingUrl(self, host=None):
log('Entering _LoadHangingUrl')
self._driver.Load(self._http_server.GetUrl(host) + '/hang') self._driver.Load(self._http_server.GetUrl(host) + '/hang')
log('Leaving _LoadHangingUrl')
def _CheckPageLoadTimeout(self, action): def _CheckPageLoadTimeout(self, action):
self._handler.request_received_event.clear() self._handler.request_received_event.clear()
...@@ -1779,30 +1766,21 @@ class ChromeDriverPageLoadTimeoutTest(ChromeDriverBaseTestWithWebServer): ...@@ -1779,30 +1766,21 @@ class ChromeDriverPageLoadTimeoutTest(ChromeDriverBaseTestWithWebServer):
def testHistoryNavigationWithPageLoadTimeout(self): def testHistoryNavigationWithPageLoadTimeout(self):
# Allow the page to load for the first time. # Allow the page to load for the first time.
log('Entering testHistoryNavigationWithPageLoadTimeout')
self._handler.send_response_event.set() self._handler.send_response_event.set()
log('After self._handler.send_response_event.set()')
self._LoadHangingUrl() self._LoadHangingUrl()
self.assertTrue(self._handler.request_received_event.wait(1)) self.assertTrue(self._handler.request_received_event.wait(1))
log('Before GoBack')
self._driver.GoBack() self._driver.GoBack()
log('Before GoForward')
self._CheckPageLoadTimeout(self._driver.GoForward) self._CheckPageLoadTimeout(self._driver.GoForward)
log('After GoForward')
self.assertEquals(self._initial_url, self._driver.GetCurrentUrl()) self.assertEquals(self._initial_url, self._driver.GetCurrentUrl())
def testRefreshWithPageLoadTimeout(self): def testRefreshWithPageLoadTimeout(self):
# Allow the page to load for the first time. # Allow the page to load for the first time.
log('Entering testRefreshWithPageLoadTimeout')
self._handler.send_response_event.set() self._handler.send_response_event.set()
log('After self._handler.send_response_event.set()')
self._LoadHangingUrl() self._LoadHangingUrl()
self.assertTrue(self._handler.request_received_event.wait(1)) self.assertTrue(self._handler.request_received_event.wait(1))
log('Before Refresh')
self._CheckPageLoadTimeout(self._driver.Refresh) self._CheckPageLoadTimeout(self._driver.Refresh)
log('After Refresh')
class ChromeDriverAndroidTest(ChromeDriverBaseTest): class ChromeDriverAndroidTest(ChromeDriverBaseTest):
......
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