Changeset 177231 in webkit
- Timestamp:
- Dec 12, 2014, 1:01:10 PM (11 years ago)
- Location:
- trunk/LayoutTests
- Files:
-
- 1 added
- 3 deleted
- 4 edited
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
TabularUnified trunk/LayoutTests/ChangeLog ¶
r177226 r177231 1 2014-12-12 Alexey Proskuryakov <ap@apple.com> 2 3 http/tests/css/link-css-disabled-value-with-slow-loading-sheet.html is flaky 4 https://bugs.webkit.org/show_bug.cgi?id=139591 5 6 Reviewed by Antti Koivisto. 7 8 * http/tests/css/resources/empty.css: Added. 9 * http/tests/css/resources/500.php: Copied from LayoutTests/http/tests/css/resources/slow-loading-sheet-in-error.php. 10 * http/tests/css/resources/slow-loading-sheet-in-error.php: Removed. 11 * http/tests/css/resources/slow-loading-sheet.php: Removed. 12 These scripts were not "slow" at all - 100 microseconds is nothing. Furthermore, 13 slow-loading-sheet-in-error.php wasn't even used, because of a typo in the test. 14 And worst of all, WebCore has its own ideas about when to load stylesheets - notably, 15 default stylesheet loading blocks script execution, so we cannot do anything before 16 the stylesheet loads. 17 18 * http/tests/css/link-css-disabled-value-with-slow-loading-sheet-in-error.html: 19 * http/tests/css/link-css-disabled-value-with-slow-loading-sheet.html: 20 Removed built-in timeout for the tests, we don't need it. Also, fixed a number of 21 small stylistic issues. 22 23 * http/tests/css/resources/link-css-disabled-value-with-slow-loading-sheet-in-error.js: Removed. 24 * http/tests/css/resources/link-css-disabled-value-with-slow-loading-sheet.js: Removed. 25 Moved inside HTML, because having tests in a separate file is useless and harmful. 26 27 * platform/mac-wk2/TestExpectations: These tests were always flaky, not 100% failing. 28 1 29 2014-12-12 Radu Stavila <stavila@adobe.com> 2 30 -
TabularUnified trunk/LayoutTests/http/tests/css/link-css-disabled-value-with-slow-loading-sheet-in-error.html ¶
r97625 r177231 1 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">1 <!DOCTYPE html> 2 2 <html> 3 3 <head> 4 <link rel="stylesheet" href="resources/ slow-loading-sheet.php?color=green" media="all" title="Default Style Sheet" type="text/css" />5 <link rel="alternate stylesheet" href="resources/ slow-loading-sheet.php-in-error" media="all" title="green" type="text/css" />4 <link rel="stylesheet" href="resources/empty.css?link-css-disabled-value-with-slow-loading-sheet-in-error&default" media="all" title="Default Style Sheet" type="text/css"> 5 <link rel="alternate stylesheet" href="resources/500.php" media="all" title="green" type="text/css"> 6 6 <script src="/js-test-resources/js-test-pre.js"></script> 7 7 </head> … … 9 9 <p id="description"></p> 10 10 <div id="console"></div> 11 <script src="resources/link-css-disabled-value-with-slow-loading-sheet-in-error.js"></script> 11 <script> 12 description("Test that HTMLLinkElement's disabled attribute is properly cached while set when loading a stylesheet."); 13 14 window.jsTestIsAsync = true; 15 16 mainSheetLink = document.getElementsByTagName("link")[0]; 17 alternateSheetLink = document.getElementsByTagName("link")[1]; 18 19 mainSheetLink.disabled = true; 20 alternateSheetLink.disabled = false; 21 22 debug("Testing value of 'disabled' prior to load just after setting them"); 23 shouldBeNonNull("mainSheetLink.sheet"); 24 shouldBeNull("alternateSheetLink.sheet"); 25 shouldBeTrue("mainSheetLink.disabled"); 26 shouldBeFalse("alternateSheetLink.disabled"); 27 28 debug("Testing the values when the alternate sheet is loaded (as this is the only one that has sheet() === null)"); 29 30 var testTimer = setInterval(function() { 31 if (!alternateSheetLink.sheet) 32 return; 33 shouldBeNonNull("mainSheetLink.sheet"); 34 shouldBeNonNull("alternateSheetLink.sheet"); 35 shouldBeTrue("mainSheetLink.disabled"); 36 shouldBeFalse("alternateSheetLink.disabled"); 37 38 clearInterval(testTimer); 39 finishJSTest(); 40 }, 25); 41 42 var successfullyParsed = true; 43 </script> 12 44 <script src="/js-test-resources/js-test-post.js"></script> 13 45 </body> -
TabularUnified trunk/LayoutTests/http/tests/css/link-css-disabled-value-with-slow-loading-sheet.html ¶
r154281 r177231 1 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">1 <!DOCTYPE html> 2 2 <html> 3 3 <head> 4 <link rel="stylesheet" href="resources/ slow-loading-sheet.php?color=red" media="all" title="Default Style Sheet" type="text/css" />5 <link rel="alternate stylesheet" href="resources/ slow-loading-sheet.php?color=green" media="all" title="green" type="text/css" />4 <link rel="stylesheet" href="resources/empty.css?link-css-disabled-value-with-slow-loading-sheet&default" media="all" title="Default Style Sheet" type="text/css"> 5 <link rel="alternate stylesheet" href="resources/empty.css?link-css-disabled-value-with-slow-loading-sheet&alternate" media="all" title="green" type="text/css"> 6 6 <script src="/js-test-resources/js-test-pre.js"></script> 7 7 </head> … … 9 9 <p id="description"></p> 10 10 <div id="console"></div> 11 <script src="resources/link-css-disabled-value-with-slow-loading-sheet.js"></script> 11 <script> 12 description("Test that HTMLLinkElement's disabled attribute is properly cached while set when loading a stylesheet."); 13 14 window.jsTestIsAsync = true; 15 16 mainSheetLink = document.getElementsByTagName("link")[0]; 17 alternateSheetLink = document.getElementsByTagName("link")[1]; 18 19 mainSheetLink.disabled = true; 20 alternateSheetLink.disabled = false; 21 22 debug("Testing value of 'disabled' prior to load just after setting them"); 23 shouldBeNonNull("mainSheetLink.sheet"); 24 shouldBeNull("alternateSheetLink.sheet"); 25 shouldBeTrue("mainSheetLink.disabled"); 26 shouldBeFalse("alternateSheetLink.disabled"); 27 28 debug("Testing the values when the alternate sheet is loaded (as this is the only one that has sheet() === null)"); 29 30 var testTimer = setInterval(function() { 31 if (!alternateSheetLink.sheet) 32 return; 33 shouldBeNonNull("mainSheetLink.sheet"); 34 shouldBeNonNull("alternateSheetLink.sheet"); 35 shouldBeTrue("mainSheetLink.disabled"); 36 shouldBeFalse("alternateSheetLink.disabled"); 37 38 clearInterval(testTimer); 39 finishJSTest(); 40 }, 25); 41 42 var successfullyParsed = true; 43 </script> 12 44 <script src="/js-test-resources/js-test-post.js"></script> 13 45 </body> -
TabularUnified trunk/LayoutTests/platform/mac-wk2/TestExpectations ¶
r177140 r177231 565 565 566 566 # There is no network load scheduling or prioritization with NetworkProcess. 567 webkit.org/b/123431 [ Mavericks+ ] http/tests/css/link-css-disabled-value-with-slow-loading-sheet-in-error.html [ Failure ]568 webkit.org/b/123431 [ Mavericks+ ] http/tests/css/link-css-disabled-value-with-slow-loading-sheet.html [ Failure ]567 webkit.org/b/123431 [ Mavericks+ ] http/tests/css/link-css-disabled-value-with-slow-loading-sheet-in-error.html [ Pass Failure ] 568 webkit.org/b/123431 [ Mavericks+ ] http/tests/css/link-css-disabled-value-with-slow-loading-sheet.html [ Pass Failure ] 569 569 webkit.org/b/123431 [ Mavericks+ ] http/tests/local/link-stylesheet-load-order-preload.html [ Failure ] 570 570 webkit.org/b/123431 [ Mavericks+ ] http/tests/local/link-stylesheet-load-order.html [ Failure ]
Note:
See TracChangeset
for help on using the changeset viewer.