Title: [139504] trunk/LayoutTests
- Revision
- 139504
- Author
- [email protected]
- Date
- 2013-01-11 14:56:34 -0800 (Fri, 11 Jan 2013)
Log Message
[Chromium] Layout Test fast/canvas/webgl/context-release-upon-reload.html is a flaky timeout
https://bugs.webkit.org/show_bug.cgi?id=106606
Reviewed by Dimitri Glazkov.
Reduced number of iterations of test, and marked as slow. Changed
test's output and expectations so number of iterations can be
adjusted without rebaselining.
* fast/canvas/webgl/context-release-upon-reload-expected.txt:
* fast/canvas/webgl/context-release-upon-reload.html:
* platform/chromium/TestExpectations:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (139503 => 139504)
--- trunk/LayoutTests/ChangeLog 2013-01-11 22:52:31 UTC (rev 139503)
+++ trunk/LayoutTests/ChangeLog 2013-01-11 22:56:34 UTC (rev 139504)
@@ -1,3 +1,18 @@
+2013-01-11 Kenneth Russell <[email protected]>
+
+ [Chromium] Layout Test fast/canvas/webgl/context-release-upon-reload.html is a flaky timeout
+ https://bugs.webkit.org/show_bug.cgi?id=106606
+
+ Reviewed by Dimitri Glazkov.
+
+ Reduced number of iterations of test, and marked as slow. Changed
+ test's output and expectations so number of iterations can be
+ adjusted without rebaselining.
+
+ * fast/canvas/webgl/context-release-upon-reload-expected.txt:
+ * fast/canvas/webgl/context-release-upon-reload.html:
+ * platform/chromium/TestExpectations:
+
2013-01-11 Sheriff Bot <[email protected]>
Unreviewed, rolling out r139044.
Modified: trunk/LayoutTests/fast/canvas/webgl/context-release-upon-reload-expected.txt (139503 => 139504)
--- trunk/LayoutTests/fast/canvas/webgl/context-release-upon-reload-expected.txt 2013-01-11 22:52:31 UTC (rev 139503)
+++ trunk/LayoutTests/fast/canvas/webgl/context-release-upon-reload-expected.txt 2013-01-11 22:56:34 UTC (rev 139504)
@@ -3,56 +3,7 @@
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-Test 1 of 10
-PASS context was created properly
-PASS getError was expected value: NO_ERROR : Should be no errors
-PASS Buffer was the correct size: 1680x1050
-
-Test 2 of 10
-PASS context was created properly
-PASS getError was expected value: NO_ERROR : Should be no errors
-PASS Buffer was the correct size: 1680x1050
-
-Test 3 of 10
-PASS context was created properly
-PASS getError was expected value: NO_ERROR : Should be no errors
-PASS Buffer was the correct size: 1680x1050
-
-Test 4 of 10
-PASS context was created properly
-PASS getError was expected value: NO_ERROR : Should be no errors
-PASS Buffer was the correct size: 1680x1050
-
-Test 5 of 10
-PASS context was created properly
-PASS getError was expected value: NO_ERROR : Should be no errors
-PASS Buffer was the correct size: 1680x1050
-
-Test 6 of 10
-PASS context was created properly
-PASS getError was expected value: NO_ERROR : Should be no errors
-PASS Buffer was the correct size: 1680x1050
-
-Test 7 of 10
-PASS context was created properly
-PASS getError was expected value: NO_ERROR : Should be no errors
-PASS Buffer was the correct size: 1680x1050
-
-Test 8 of 10
-PASS context was created properly
-PASS getError was expected value: NO_ERROR : Should be no errors
-PASS Buffer was the correct size: 1680x1050
-
-Test 9 of 10
-PASS context was created properly
-PASS getError was expected value: NO_ERROR : Should be no errors
-PASS Buffer was the correct size: 1680x1050
-
-Test 10 of 10
-PASS context was created properly
-PASS getError was expected value: NO_ERROR : Should be no errors
-PASS Buffer was the correct size: 1680x1050
+PASS All drawing buffers were allocated at the correct size
PASS successfullyParsed is true
TEST COMPLETE
Modified: trunk/LayoutTests/fast/canvas/webgl/context-release-upon-reload.html (139503 => 139504)
--- trunk/LayoutTests/fast/canvas/webgl/context-release-upon-reload.html 2013-01-11 22:52:31 UTC (rev 139503)
+++ trunk/LayoutTests/fast/canvas/webgl/context-release-upon-reload.html 2013-01-11 22:56:34 UTC (rev 139504)
@@ -20,33 +20,48 @@
}
var host = document.getElementById("host");
-var testIterations = 10;
+var testIterations = 8;
var currentIteration = 0;
function refreshFrame() {
if(currentIteration < testIterations) {
currentIteration++;
- debug("");
- debug("Test " + currentIteration + " of " + testIterations);
host.src = ""
} else {
+ testPassed("All drawing buffers were allocated at the correct size");
finishTest();
}
}
function testContext() {
+ var bail = false;
var gl = host.contentWindow.glContext;
- assertMsg(gl != null, "context was created properly");
+ if (gl == null) {
+ bail = true;
+ testFailed("context was not created properly");
+ }
- glErrorShouldBe(gl, gl.NO_ERROR, "Should be no errors");
+ if (gl) {
+ var err = gl.getError();
+ if (err != gl.NO_ERROR) {
+ bail = true;
+ testFailed("Should be no GL error; got " + getGLErrorAsString(gl, err));
+ }
+ }
- if(gl.canvas.width != gl.drawingBufferWidth ||
- gl.canvas.height != gl.drawingBufferHeight) {
- testFailed("Buffer was the wrong size: " +
+ if (bail) {
+ finishTest();
+ return;
+ }
+
+ if (gl.canvas.width != gl.drawingBufferWidth ||
+ gl.canvas.height != gl.drawingBufferHeight) {
+ testFailed("At iteration " + currentIteration + " of " + testIterations +
+ ": Buffer was the wrong size: " +
gl.drawingBufferWidth + "x" + gl.drawingBufferHeight);
+ finishTest();
+ return;
} else {
- testPassed("Buffer was the correct size: " +
- gl.drawingBufferWidth + "x" + gl.drawingBufferHeight);
refreshFrame();
}
Modified: trunk/LayoutTests/platform/chromium/TestExpectations (139503 => 139504)
--- trunk/LayoutTests/platform/chromium/TestExpectations 2013-01-11 22:52:31 UTC (rev 139503)
+++ trunk/LayoutTests/platform/chromium/TestExpectations 2013-01-11 22:56:34 UTC (rev 139504)
@@ -94,6 +94,8 @@
crbug.com/24182 [ Debug ] platform/chromium/inspector/styles/device-metrics-fit-window.html [ Pass Slow ]
webkit.org/b/105785 [ Release ] http/tests/inspector/indexeddb [ Pass Slow ]
crbug.com/24182 [ Debug ] platform/chromium/virtual/gpu/fast/hidpi/image-set-background-dynamic.html [ Pass Slow ]
+webkit.org/b/106606 fast/canvas/webgl/context-release-upon-reload.html [ Pass Slow ]
+webkit.org/b/106606 platform/chromium/virtual/gpu/fast/canvas/webgl/context-release-upon-reload.html [ Pass Slow ]
# These tests started being slow when we switched to DRT.
webkit.org/b/90488 [ Debug ] inspector [ Pass Slow ]
@@ -4283,8 +4285,6 @@
webkit.org/b/103955 fast/repaint/repaint-across-writing-mode-boundary.html [ ImageOnlyFailure ]
webkit.org/b/103955 fast/repaint/selection-rl.html [ ImageOnlyFailure ]
webkit.org/b/103955 fast/repaint/caret-with-transformation.html [ Missing ]
-webkit.org/b/106606 fast/canvas/webgl/context-release-upon-reload.html [ Timeout Pass ]
-webkit.org/b/106606 platform/chromium/virtual/gpu/fast/canvas/webgl/context-release-upon-reload.html [ Timeout Pass ]
webkit.org/b/106609 [ Win ] animations/fill-mode-iteration-count-non-integer.html [ Failure ]
webkit.org/b/106612 [ Win ] fast/dom/HTMLTemplateElement/ownerDocument-adoptNode.html [ Failure Pass ]
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
