Changeset 90627 in webkit

Timestamp:

Jul 8, 2011 6:42:27 AM (13 years ago)

Author:

kov@webkit.org

Message:

[GTK] testwebview API test fails after ​http://trac.webkit.org/changeset/90471
​https://bugs.webkit.org/show_bug.cgi?id=64159

Rework the icon-uri change test so that the condition for quitting
the mainloop is the icon-uri change itself, along with a timeout
to avoid taking too long in case of failure. Since the conditions
for considering a page loaded were changed we can't rely on that
for this test anymore.

Patch by Gustavo Noronha Silva <​gustavo.noronha@collabora.com> on 2011-07-08
Reviewed by Xan Lopez.

• tests/testwebview.c:

(timeout_cb): error out if it takes too long for the icon-uri
change to happen.
(icon_uri_changed_cb): quit the loop here instead of waiting on
the page being loaded.
(test_webkit_web_view_icon_uri):

Location:

trunk/Source/WebKit/gtk

Files:

• ChangeLog (modified) (1 diff)
• tests/testwebview.c (modified) (5 diffs)

trunk/Source/WebKit/gtk/ChangeLog

@@ +1 @@
+2011-07-08  Gustavo Noronha Silva  <gustavo.noronha@collabora.com>
+
+        [GTK] testwebview API test fails after http://trac.webkit.org/changeset/90471
+        https://bugs.webkit.org/show_bug.cgi?id=64159
+
+        Rework the icon-uri change test so that the condition for quitting
+        the mainloop is the icon-uri change itself, along with a timeout
+        to avoid taking too long in case of failure. Since the conditions
+        for considering a page loaded were changed we can't rely on that
+        for this test anymore.
+
+        Reviewed by Xan Lopez.
+
+        * tests/testwebview.c:
+        (timeout_cb): error out if it takes too long for the icon-uri
+        change to happen.
+        (icon_uri_changed_cb): quit the loop here instead of waiting on
+        the page being loaded.
+        (test_webkit_web_view_icon_uri):
+
 2011-07-01  Joone Hur  <joone.hur@collabora.co.uk>
 

trunk/Source/WebKit/gtk/tests/testwebview.c

@@ -79 +79 @@
 }
 
+static gboolean timeout_cb(gpointer data)
+{
+    g_error("Didn't get icon-uri before timing out.");
+    return FALSE;
+}
+
 static void icon_uri_changed_cb(WebKitWebView* web_view, GParamSpec* pspec, gpointer data)
 {
-    gboolean* been_here = (gboolean*)data;
     char* expected_uri;
 
@@ -90 +95 @@
     g_free(expected_uri);
 
-    *been_here = TRUE;
+    g_main_loop_quit(loop);
 }
 
@@ -107 +112 @@
 static void test_webkit_web_view_icon_uri()
 {
-    gboolean been_to_uri_changed = FALSE;
     gboolean been_to_icon_loaded = FALSE;
     WebKitWebView* view = WEBKIT_WEB_VIEW(webkit_web_view_new());
@@ -115 +119 @@
 
     g_object_connect(G_OBJECT(view),
-                     "signal::notify::progress", idle_quit_loop_cb, NULL,
-                     "signal::notify::icon-uri", icon_uri_changed_cb, &been_to_uri_changed,
+                     "signal::notify::icon-uri", icon_uri_changed_cb, NULL,
                      "signal::icon-loaded", icon_loaded_cb, &been_to_icon_loaded,
                      NULL);
@@ -122 +125 @@
     webkit_web_view_load_uri(view, base_uri);
 
-    g_main_loop_run(loop);
-
-    g_assert(been_to_uri_changed);
+    guint timeout_id = g_timeout_add(500, timeout_cb, 0);
+
+    g_main_loop_run(loop);
+
+    g_source_remove(timeout_id);
+
     g_assert(been_to_icon_loaded);