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

[kov at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit e96c7eeb852fb3ce954caea5a3a7a5d723ec26a0
Author: kov at webkit.org <kov at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 8 12:12:05 2010 +0000

    2010-12-08  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
    
            Reviewed by Xan Lopez.
    
            The storage for the subresources is a GHashTable which does not
            guarantee order, so we need to make our checking more resilient.
    
            * tests/testwebresource.c:
            (test_web_resource_sub_resource_loading):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73507 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index 9ef018b..7456258 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,13 @@
+2010-12-08  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
+
+        Reviewed by Xan Lopez.
+
+        The storage for the subresources is a GHashTable which does not
+        guarantee order, so we need to make our checking more resilient.
+
+        * tests/testwebresource.c:
+        (test_web_resource_sub_resource_loading):
+
 2010-12-08  Alejandro G. Castro  <alex at igalia.com>
 
         Reviewed by Gustavo Noronha Silva.
diff --git a/WebKit/gtk/tests/testwebresource.c b/WebKit/gtk/tests/testwebresource.c
index 4a16a03..d699c91 100644
--- a/WebKit/gtk/tests/testwebresource.c
+++ b/WebKit/gtk/tests/testwebresource.c
@@ -279,8 +279,13 @@ static void test_web_resource_sub_resource_loading()
     g_assert(sub_resources->next);
     g_assert(!sub_resources->next->next);
 
-    g_assert(WEBKIT_WEB_RESOURCE(sub_resources->data) == sub_resource);
-    
+    // Test that the object we got from the data source is the same
+    // that went through resource-request-starting. Note that the order is
+    // not important (and not guaranteed since the resources are stored in a
+    // hashtable).
+    g_assert(WEBKIT_WEB_RESOURCE(sub_resources->data) == sub_resource
+             || WEBKIT_WEB_RESOURCE(sub_resources->next->data) == sub_resource);
+
     g_object_unref(web_view);
     g_main_loop_unref(loop);
 }
@@ -298,7 +303,7 @@ int main(int argc, char** argv)
 
     soup_server_add_handler(server, NULL, server_callback, NULL, NULL);
 
-    soup_uri = soup_uri_new ("http://127.0.0.1/");                             
+    soup_uri = soup_uri_new("http://127.0.0.1/");
     soup_uri_set_port(soup_uri, soup_server_get_port(server));
 
     base_uri = soup_uri_to_string(soup_uri, FALSE);

-- 
WebKit Debian packaging