Commit b6077eca authored by Kenneth Russell's avatar Kenneth Russell Committed by Commit Bot

Re-suppress new context lost tests on Nexus 9 and Shield TV.

Suppress the following tests again:
  ContextLost_WebGLBlockedAfterJSNavigation
  ContextLost_WebGLUnblockedAfterUserInitiatedReload

They're still failing reliably on these two bots.

Also restart the browser after running these two tests; this was
forgotten, and appears necessary for any of these tests which tear
down the GPU process.

Tbr: ynovikov@chromium.org
Tbr: sugoi@chromium.org
No-Try: true
Bug: 832886
Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel
Change-Id: I5918e7b731023b8efb8e1202f8c9b57e1089e1bd
Reviewed-on: https://chromium-review.googlesource.com/1025112
Commit-Queue: Yuly Novikov <ynovikov@chromium.org>
Reviewed-by: default avatarKenneth Russell <kbr@chromium.org>
Reviewed-by: default avatarAlexis Hétu <sugoi@chromium.org>
Reviewed-by: default avatarYuly Novikov <ynovikov@chromium.org>
Cr-Commit-Position: refs/heads/master@{#553330}
parent b49715e3
......@@ -53,3 +53,9 @@ class ContextLostExpectations(GpuTestExpectations):
['android', ('qualcomm', 'Adreno (TM) 420')], bug=611906)
self.Fail('ContextLost_WebGLContextLostFromQuantity',
['android', ('qualcomm', 'Adreno (TM) 420')], bug=611906)
# Nexus 9 and Nvidia Shield TV
self.Fail('ContextLost_WebGLBlockedAfterJSNavigation',
['android', 'nvidia'], bug=832886)
self.Fail('ContextLost_WebGLUnblockedAfterUserInitiatedReload',
['android', 'nvidia'], bug=832886)
......@@ -270,9 +270,7 @@ class ContextLostIntegrationTest(gpu_integration_test.GpuIntegrationTest):
def _ContextLost_WebGLBlockedAfterJSNavigation(self, test_path):
self.RestartBrowserIfNecessaryWithArgs(self._AddDefaultArgs([]))
self._NavigateAndWaitForLoad(test_path)
tab = self.tab
# Make sure the tab got a WebGL context.
if tab.EvaluateJavaScript('window.domAutomationController._finished'):
# This means the test failed for some reason.
......@@ -280,7 +278,6 @@ class ContextLostIntegrationTest(gpu_integration_test.GpuIntegrationTest):
self.fail('Initial page claimed to succeed early')
else:
self.fail('Initial page failed to get a WebGL context')
# Kill the GPU process in order to get WebGL blocked.
gpucrash_tab = tab.browser.tabs.New()
try:
......@@ -303,17 +300,15 @@ class ContextLostIntegrationTest(gpu_integration_test.GpuIntegrationTest):
gpucrash_tab.Close()
except Exception:
print 'Tab crashed while closing chrome://gpucrash'
self._RestartBrowser('must restart after tests that kill the GPU process')
def _ContextLost_WebGLUnblockedAfterUserInitiatedReload(self, test_path):
self.RestartBrowserIfNecessaryWithArgs(self._AddDefaultArgs([]))
self._NavigateAndWaitForLoad(test_path)
tab = self.tab
# Make sure the tab initially got a WebGL context.
if not tab.EvaluateJavaScript('window.domAutomationController._succeeded'):
self.fail('Tab failed to get an initial WebGL context')
# Kill the GPU process in order to get WebGL blocked.
gpucrash_tab = tab.browser.tabs.New()
try:
......@@ -343,6 +338,7 @@ class ContextLostIntegrationTest(gpu_integration_test.GpuIntegrationTest):
gpucrash_tab.Close()
except Exception:
print 'Tab crashed while closing chrome://gpucrash'
self._RestartBrowser('must restart after tests that kill the GPU process')
def load_tests(loader, tests, pattern):
del loader, tests, pattern # Unused.
......
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