[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[eric at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 2b1c6f9565aa00640e1a0d953fc89b49fc9c4e67
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Aug 8 07:33:37 2010 +0000

    2010-08-08  Mihai Parparita  <mihaip at chromium.org>
    
            Reviewed by Adam Barth.
    
            Chromium: isindex tests timeout after r64712
            https://bugs.webkit.org/show_bug.cgi?id=43543
    
            Update isindex tests/expectactions after r64712 so that even though they
            stil fail, they fail immediately instead of timing out.
    
            * http/tests/misc/isindex-formdata-expected.txt:
            * http/tests/misc/isindex-formdata.html:
            * http/tests/misc/isindex-with-no-form-base-href-expected.txt:
            * http/tests/misc/resources/isindex-with-no-form-base-href.html:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64944 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index b34ecb1..e9e7aab 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,18 @@
+2010-08-08  Mihai Parparita  <mihaip at chromium.org>
+
+        Reviewed by Adam Barth.
+
+        Chromium: isindex tests timeout after r64712
+        https://bugs.webkit.org/show_bug.cgi?id=43543
+        
+        Update isindex tests/expectactions after r64712 so that even though they
+        stil fail, they fail immediately instead of timing out.
+
+        * http/tests/misc/isindex-formdata-expected.txt:
+        * http/tests/misc/isindex-formdata.html:
+        * http/tests/misc/isindex-with-no-form-base-href-expected.txt:
+        * http/tests/misc/resources/isindex-with-no-form-base-href.html:
+
 2010-08-07  Mihai Parparita  <mihaip at chromium.org>
 
         Reviewed by Adam Barth.
diff --git a/LayoutTests/http/tests/misc/isindex-formdata-expected.txt b/LayoutTests/http/tests/misc/isindex-formdata-expected.txt
index 45b24a8..2883349 100644
--- a/LayoutTests/http/tests/misc/isindex-formdata-expected.txt
+++ b/LayoutTests/http/tests/misc/isindex-formdata-expected.txt
@@ -1,5 +1,4 @@
-CONSOLE MESSAGE: line 10: TypeError: Result of expression 'document.getElementById("isindex")' [null] is not an object.
-FAIL: Timed out waiting for notifyDone to be called
 This page tests that we correctly put the value of an <isindex> element into the form data.
 
+FAIL: could not find isindex element
 
diff --git a/LayoutTests/http/tests/misc/isindex-formdata.html b/LayoutTests/http/tests/misc/isindex-formdata.html
index c6da948..e9ecc5b 100644
--- a/LayoutTests/http/tests/misc/isindex-formdata.html
+++ b/LayoutTests/http/tests/misc/isindex-formdata.html
@@ -7,6 +7,12 @@ function test()
             layoutTestController.waitUntilDone();
         }
 
+        if (!document.getElementById("isindex")) {
+            log("FAIL: could not find isindex element");
+            if (window.layoutTestController)
+                layoutTestController.notifyDone();
+            return;
+        }
         document.getElementById("isindex").value = "This is a test";
         document.forms[0].submit();
     } else {
diff --git a/LayoutTests/http/tests/misc/isindex-with-no-form-base-href-expected.txt b/LayoutTests/http/tests/misc/isindex-with-no-form-base-href-expected.txt
index e390ca0..4566355 100644
--- a/LayoutTests/http/tests/misc/isindex-with-no-form-base-href-expected.txt
+++ b/LayoutTests/http/tests/misc/isindex-with-no-form-base-href-expected.txt
@@ -1,9 +1,9 @@
-FAIL: Timed out waiting for notifyDone to be called
 
 
 --------
 Frame: '<!--framePath //<!--frame0-->-->'
 --------
+FAIL: could not find form with expected action
 This page tests that we correctly put the value of an <isindex> element into the form data.
 
 If you are running this test by hand, press the enter/return key on your keyboard to submit.
diff --git a/LayoutTests/http/tests/misc/resources/isindex-with-no-form-base-href.html b/LayoutTests/http/tests/misc/resources/isindex-with-no-form-base-href.html
index 06bede8..c2ec08d 100644
--- a/LayoutTests/http/tests/misc/resources/isindex-with-no-form-base-href.html
+++ b/LayoutTests/http/tests/misc/resources/isindex-with-no-form-base-href.html
@@ -2,8 +2,21 @@
 <head>
 <base href="http://localhost:8000/misc/resources/isindex-with-no-form-base-href-submit.html">
 <script>
+function log(msg)
+{
+    document.getElementById("log").appendChild(document.createTextNode(msg + "\n"));
+}
+
 function test()
 {
+    var forms = document.getElementsByTagName('form');
+    if (forms.length != 1 || forms[0].action != 'http://localhost:8000/misc/resources/isindex-with-no-form-base-href-submit.html') {
+        log('FAIL: could not find form with expected action');
+        if (window.layoutTestController)
+            layoutTestController.notifyDone();
+    }
+
+
     var isindexElm = document.getElementById("isindex");
     isindexElm.value = "This is a test";
     isindexElm.focus();
@@ -16,6 +29,7 @@ window.onload = test;
 </script>
 </head>
 <body>
+<pre id="log"></pre>
 <p>This page tests that we correctly put the value of an <tt>&lt;isindex&gt;</tt> element into the form data.</p>
 <p>If you are running this test by hand, press the enter/return key on your keyboard to submit.</p>
 <isindex id="isindex"></isindex>

-- 
WebKit Debian packaging