[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

sergio at webkit.org sergio at webkit.org
Sun Feb 20 23:58:56 UTC 2011


The following commit has been merged in the webkit-1.3 branch:
commit 1435bfcb7ccd5d05522da9276183e52cb9c67294
Author: sergio at webkit.org <sergio at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 27 12:44:29 2011 +0000

    2011-01-27  Sergio Villar Senin  <svillar at igalia.com>
    
            Unreviewed.
    
            New test expectations for http/tests/navigation/error404* in GTK.
    
            * platform/gtk/Skipped:
            * platform/gtk/http/tests/navigation/error404-basic-expected.txt: Added.
            * platform/gtk/http/tests/navigation/error404-goback-expected.txt: Added.
            * platform/gtk/http/tests/navigation/error404-subframeload-expected.txt: Added.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76787 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 2358ab0..f962dd0 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2011-01-27  Sergio Villar Senin  <svillar at igalia.com>
+
+        Unreviewed.
+
+        New test expectations for http/tests/navigation/error404* in GTK.
+
+        * platform/gtk/Skipped:
+        * platform/gtk/http/tests/navigation/error404-basic-expected.txt: Added.
+        * platform/gtk/http/tests/navigation/error404-goback-expected.txt: Added.
+        * platform/gtk/http/tests/navigation/error404-subframeload-expected.txt: Added.
+
 2011-01-27  Philippe Normand  <pnormand at igalia.com>
 
         Unreviewed, skipping 2 more media tests.
diff --git a/LayoutTests/platform/gtk/Skipped b/LayoutTests/platform/gtk/Skipped
index d676ce3..592d92e 100644
--- a/LayoutTests/platform/gtk/Skipped
+++ b/LayoutTests/platform/gtk/Skipped
@@ -2283,10 +2283,6 @@ http/tests/multipart/invalid-image-data-standalone.html
 http/tests/multipart/invalid-image-data.html
 http/tests/multipart/policy-ignore-crash.php
 http/tests/navigation/anchor-frames.html
-http/tests/navigation/error404-basic.html
-http/tests/navigation/error404-frames.html
-http/tests/navigation/error404-goback.html
-http/tests/navigation/error404-subframeload.html
 http/tests/navigation/javascriptlink-frames.html
 http/tests/navigation/post-basic.html
 http/tests/navigation/post-frames.html
diff --git a/LayoutTests/platform/gtk/http/tests/navigation/error404-basic-expected.txt b/LayoutTests/platform/gtk/http/tests/navigation/error404-basic-expected.txt
new file mode 100644
index 0000000..3902651
--- /dev/null
+++ b/LayoutTests/platform/gtk/http/tests/navigation/error404-basic-expected.txt
@@ -0,0 +1,12 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+  RenderBlock {HTML} at (0,0) size 800x600
+    RenderBody {BODY} at (8,8) size 784x584
+      RenderText {#text} at (0,0) size 364x19
+        text run at (0,0) width 364: "This 404 error was intentionally generated by a test script."
+
+============== Back Forward List ==============
+        http://127.0.0.1:8000/navigation/error404-basic.html  **nav target**
+curr->  http://127.0.0.1:8000/navigation/resources/error404.pl  **nav target**
+===============================================
diff --git a/LayoutTests/platform/gtk/http/tests/navigation/error404-goback-expected.txt b/LayoutTests/platform/gtk/http/tests/navigation/error404-goback-expected.txt
new file mode 100644
index 0000000..045fb31
--- /dev/null
+++ b/LayoutTests/platform/gtk/http/tests/navigation/error404-goback-expected.txt
@@ -0,0 +1,15 @@
+CONSOLE MESSAGE: line 1: ReferenceError: Can't find variable: fillTestForm
+CONSOLE MESSAGE: line 1: ReferenceError: Can't find variable: scrollDocDown
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+  RenderBlock {HTML} at (0,0) size 800x600
+    RenderBody {BODY} at (8,8) size 784x584
+      RenderText {#text} at (0,0) size 364x19
+        text run at (0,0) width 364: "This 404 error was intentionally generated by a test script."
+
+============== Back Forward List ==============
+        http://127.0.0.1:8000/navigation/error404-goback.html  **nav target**
+curr->  http://127.0.0.1:8000/navigation/resources/error404.pl  **nav target**
+        http://127.0.0.1:8000/navigation/resources/otherpage.html  **nav target**
+===============================================
diff --git a/LayoutTests/platform/gtk/http/tests/navigation/error404-subframeload-expected.txt b/LayoutTests/platform/gtk/http/tests/navigation/error404-subframeload-expected.txt
new file mode 100644
index 0000000..6c7e8fe
--- /dev/null
+++ b/LayoutTests/platform/gtk/http/tests/navigation/error404-subframeload-expected.txt
@@ -0,0 +1,32 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+  RenderBlock {HTML} at (0,0) size 800x600
+    RenderFrameSet {FRAMESET} at (0,0) size 800x600
+      RenderFrame {FRAME} at (0,0) size 800x534
+        layer at (0,0) size 800x534
+          RenderView at (0,0) size 800x534
+        layer at (0,0) size 800x534
+          RenderBlock {HTML} at (0,0) size 800x534
+            RenderBody {BODY} at (8,8) size 784x518
+              RenderText {#text} at (0,0) size 364x19
+                text run at (0,0) width 364: "This 404 error was intentionally generated by a test script."
+      RenderFrame {FRAME} at (0,540) size 800x60
+        layer at (0,0) size 784x90
+          RenderView at (0,0) size 784x60
+        layer at (0,0) size 784x90
+          RenderBlock {HTML} at (0,0) size 784x90
+            RenderBody {BODY} at (8,8) size 768x74
+              RenderText {#text} at (0,0) size 722x73
+                text run at (0,0) width 722: "This is just a minimal page that we navigate to as part of"
+                text run at (0,37) width 272: "testing back/forward."
+
+============== Back Forward List ==============
+        http://127.0.0.1:8000/navigation/error404-subframeload.html  **nav target**
+        http://127.0.0.1:8000/navigation/resources/frameset.pl?frameURL=otherpage.html  **nav target**
+            http://127.0.0.1:8000/navigation/resources/otherpage.html (in frame "footer")
+            http://127.0.0.1:8000/navigation/resources/otherpage.html (in frame "main")
+curr->  http://127.0.0.1:8000/navigation/resources/frameset.pl?frameURL=otherpage.html
+            http://127.0.0.1:8000/navigation/resources/otherpage.html (in frame "footer")
+            http://127.0.0.1:8000/navigation/resources/error404.pl (in frame "main")  **nav target**
+===============================================

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list