[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[kov at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 1b224b6c4d5934b60d1832bce1d4051e1c379a11
Author: kov at webkit.org <kov at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Dec 5 16:56:05 2009 +0000

    Reviewed by Xan Lopez.
    
    Use a better URI for the unreachable test. localhost:80 is very
    likely to be open.
    
    * tests/testwebdatasource.c:
    (load_finished_unreachable_cb):
    (test_webkit_web_data_source_unreachable_uri):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51726 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index c0c42d4..77cde53 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,14 @@
+2009-12-05  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
+
+        Reviewed by Xan Lopez.
+
+        Use a better URI for the unreachable test. localhost:80 is very
+        likely to be open.
+
+        * tests/testwebdatasource.c:
+        (load_finished_unreachable_cb):
+        (test_webkit_web_data_source_unreachable_uri):
+
 2009-12-03  Brady Eidson  <beidson at apple.com>
 
         Reviewed by Sam Weinig.
diff --git a/WebKit/gtk/tests/testwebdatasource.c b/WebKit/gtk/tests/testwebdatasource.c
index de2430f..fe5c62f 100644
--- a/WebKit/gtk/tests/testwebdatasource.c
+++ b/WebKit/gtk/tests/testwebdatasource.c
@@ -66,7 +66,7 @@ static void load_finished_unreachable_cb(WebKitWebView* view, WebKitWebFrame* fr
     frame = webkit_web_view_get_main_frame(view);
     datasource = webkit_web_frame_get_data_source(frame);
 
-    g_assert_cmpstr("http://localhost/doireallyexist.html", ==,
+    g_assert_cmpstr("http://this.host.does.not.exist/doireallyexist.html", ==,
                     webkit_web_data_source_get_unreachable_uri(datasource));
 
     if (g_main_loop_is_running(loop))
@@ -149,7 +149,7 @@ static void test_webkit_web_data_source_unreachable_uri()
     g_object_ref_sink(view);
     loop = g_main_loop_new(NULL, TRUE);
     g_signal_connect(view, "load-finished", G_CALLBACK(load_finished_unreachable_cb), loop);
-    webkit_web_view_load_uri(view, "http://localhost/doireallyexist.html");
+    webkit_web_view_load_uri(view, "http://this.host.does.not.exist/doireallyexist.html");
 
     if (!waitTimer)
         waitTimer = g_timeout_add_seconds(defaultTimeout, (GSourceFunc)wait_timer_fired, loop);

-- 
WebKit Debian packaging