Changeset 58984 in webkit


Ignore:
Timestamp:
May 7, 2010 4:51:15 PM (14 years ago)
Author:
dpranke@chromium.org
Message:

2010-05-06 Dirk Pranke <​dpranke@chromium.org>

Reviewed by Alexey Proskuryakov.

Rewrite test to fail faster if the inner frame doesn't load at all
for some reason (previous version would raise a TypeError before
the timeout was set).

​https://bugs.webkit.org/show_bug.cgi?id=38705

  • http/tests/security/sandbox-inherit-to-initial-document-2.html:
  • platform/chromium/test_expectations.txt:
Location:
trunk/LayoutTests
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r58972 r58984  
     12010-05-06  Dirk Pranke  <dpranke@chromium.org>
     2
     3        Reviewed by Alexey Proskuryakov.
     4
     5        Rewrite test to fail faster if the inner frame doesn't load at all
     6        for some reason (previous version would raise a TypeError before
     7        the timeout was set).
     8
     9        https://bugs.webkit.org/show_bug.cgi?id=38705
     10
     11        * http/tests/security/sandbox-inherit-to-initial-document-2.html:
     12        * platform/chromium/test_expectations.txt:
     13
    1142010-05-07  John Gregg  <johnnyg@google.com>
    215

  • trunk/LayoutTests/http/tests/security/sandbox-inherit-to-initial-document-2.html

    r58695 r58984  
    2828function test()
    2929{
    30     var doc = frames[0].frames[0].document;
    31     var scr = doc.createElement("script");
    32     scr.appendChild(doc.createTextNode("top.scriptWorked()"));
    33 
    34     timeoutId = setTimeout(timedOut, 10);
    35 
    36     doc.body.appendChild(scr);
     30    if (frames[0]) {
     31        var doc = frames[0].frames[0].document;
     32        var scr = doc.createElement("script");
     33        scr.appendChild(doc.createTextNode("top.scriptWorked()"));
     34        timeoutId = setTimeout(timedOut, 10);
     35        doc.body.appendChild(scr);
     36    } else {
     37        document.getElementById("result").innerHTML = "FAIL: no inner frame";
     38        layoutTestController.notifyDone();
     39    }
    3740}
    3841</script>

  • trunk/LayoutTests/platform/chromium/test_expectations.txt

    r58928 r58984  
    28022802WONTFIX : media/video-duration-known-after-eos.html = TEXT TIMEOUT
    28032803
    2804 BUGWK38705 : http/tests/security/sandbox-inherit-to-initial-document-2.html = PASS TIMEOUT
     2804BUGWK38705 : http/tests/security/sandbox-inherit-to-initial-document-2.html = TEXT
    28052805
    28062806BUG43495 LINUX : svg/W3C-SVG-1.1/render-groups-01-b.svg = IMAGE
Note: See TracChangeset for help on using the changeset viewer.