Title: [175036] releases/WebKitGTK/webkit-2.4/Tools
Revision
175036
Author
[email protected]
Date
2014-10-22 03:10:46 -0700 (Wed, 22 Oct 2014)

Log Message

Merge r174926 - [GTK] Test TestWebKitAPI/WebKit2Gtk/TestInspectorServer fails
https://bugs.webkit.org/show_bug.cgi?id=132044

Reviewed by Brian Burg.

Tools:

* TestWebKitAPI/Tests/WebKit2Gtk/TestInspectorServer.cpp:
(openRemoteDebuggingSession): Remove trailing slash when
concatenating base inspector URL with the page, because the
inspector returns the relative paths with a leading slash.

Modified Paths

Diff

Modified: releases/WebKitGTK/webkit-2.4/Tools/ChangeLog (175035 => 175036)


--- releases/WebKitGTK/webkit-2.4/Tools/ChangeLog	2014-10-22 10:06:17 UTC (rev 175035)
+++ releases/WebKitGTK/webkit-2.4/Tools/ChangeLog	2014-10-22 10:10:46 UTC (rev 175036)
@@ -1,3 +1,15 @@
+2014-10-21  Carlos Garcia Campos  <[email protected]>
+
+        [GTK] Test TestWebKitAPI/WebKit2Gtk/TestInspectorServer fails
+        https://bugs.webkit.org/show_bug.cgi?id=132044
+
+        Reviewed by Brian Burg.
+
+        * TestWebKitAPI/Tests/WebKit2Gtk/TestInspectorServer.cpp:
+        (openRemoteDebuggingSession): Remove trailing slash when
+        concatenating base inspector URL with the page, because the
+        inspector returns the relative paths with a leading slash.
+
 2014-09-25  Carlos Garcia Campos  <[email protected]>
 
         Unreviewed. Get rid of runtime warnings about deprecated properties and signals, since they break the tests.

Modified: releases/WebKitGTK/webkit-2.4/Tools/Scripts/run-gtk-tests (175035 => 175036)


--- releases/WebKitGTK/webkit-2.4/Tools/Scripts/run-gtk-tests	2014-10-22 10:06:17 UTC (rev 175035)
+++ releases/WebKitGTK/webkit-2.4/Tools/Scripts/run-gtk-tests	2014-10-22 10:10:46 UTC (rev 175036)
@@ -83,7 +83,6 @@
         SkippedTest("WebKit2/TestWebKit2", "WebKit2.TerminateTwice", "Test causes crash on the next test", 121970),
         SkippedTest("WebKit2/TestWebKit2", "WebKit2.GeolocationTransitionToHighAccuracy", "Test causes crash on the next test", 125068),
         SkippedTest("WebKit2/TestWebKit2", "WebKit2.GeolocationTransitionToLowAccuracy", "Test causes crash on the next test", 125068),
-        SkippedTest("WebKit2Gtk/TestInspectorServer", SkippedTest.ENTIRE_SUITE, "Timing out on the bot", 122571),
     ]
 
     def __init__(self, options, tests=[]):

Modified: releases/WebKitGTK/webkit-2.4/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestInspectorServer.cpp (175035 => 175036)


--- releases/WebKitGTK/webkit-2.4/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestInspectorServer.cpp	2014-10-22 10:06:17 UTC (rev 175035)
+++ releases/WebKitGTK/webkit-2.4/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestInspectorServer.cpp	2014-10-22 10:10:46 UTC (rev 175036)
@@ -233,7 +233,7 @@
     g_assert(_javascript_Result);
     g_assert(!error.get());
 
-    String resolvedURL = String("http://127.0.0.1:2999/") + String::fromUTF8(WebViewTest::_javascript_ResultToCString(_javascript_Result));
+    String resolvedURL = String("http://127.0.0.1:2999") + String::fromUTF8(WebViewTest::_javascript_ResultToCString(_javascript_Result));
     test->loadURI(resolvedURL.utf8().data());
     test->waitUntilLoadFinished();
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to