Make layout tests not access apache on localhost:80

https://bugs.webkit.org/show_bug.cgi?id=82197

Patch by Pablo Flouret <pablof@motorola.com> on 2012-04-12
Reviewed by Ryosuke Niwa.

It pollutes the logs of people running a local webserver, and has the
potential for changing the results of tests run locally.

* fast/dom/onerror-img.html:
* fast/js/custom-constructors-expected.txt:
* fast/js/script-tests/custom-constructors.js:
* fast/notifications/notifications-double-show.html:
* fast/notifications/notifications-with-permission.html:
* fast/notifications/notifications-without-permission.html:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@114064 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 74c7ef8..6bbd6f3 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,20 @@
+2012-04-12  Pablo Flouret  <pablof@motorola.com>
+
+        Make layout tests not access apache on localhost:80
+        https://bugs.webkit.org/show_bug.cgi?id=82197
+
+        Reviewed by Ryosuke Niwa.
+
+        It pollutes the logs of people running a local webserver, and has the
+        potential for changing the results of tests run locally.
+
+        * fast/dom/onerror-img.html:
+        * fast/js/custom-constructors-expected.txt:
+        * fast/js/script-tests/custom-constructors.js:
+        * fast/notifications/notifications-double-show.html:
+        * fast/notifications/notifications-with-permission.html:
+        * fast/notifications/notifications-without-permission.html:
+
 2012-04-12  Rob Buis  <rbuis@rim.com>
 
         XMLSerializer().serializeToString() doesn't generate the XML declaration markup like Opera and Firefox

diff --git a/LayoutTests/fast/dom/onerror-img.html b/LayoutTests/fast/dom/onerror-img.html
index 9d349d9..5e7bb4c 100644 (file)
--- a/LayoutTests/fast/dom/onerror-img.html
+++ b/LayoutTests/fast/dom/onerror-img.html
@@ -24,7 +24,7 @@ function test()
             layoutTestController.notifyDone();
         }
     };
-    img1.src = "http://127.0.0.1/hahaha_good_luck_finding_me.jpg";
+    img1.src = "invalidinvalid.jpg";
 }
 </script>
 </head>

diff --git a/LayoutTests/fast/js/custom-constructors-expected.txt b/LayoutTests/fast/js/custom-constructors-expected.txt
index fd3ce72..fcddfc2 100644 (file)
--- a/LayoutTests/fast/js/custom-constructors-expected.txt
+++ b/LayoutTests/fast/js/custom-constructors-expected.txt
@@ -40,8 +40,8 @@ PASS new Audio() is non-null.
 PASS new Audio().tagName is "AUDIO"
 PASS new Audio().src is ""
 PASS new Audio().preload is "auto"
-PASS new Audio('http://localhost/someurl').src is "http://localhost/someurl"
-PASS new Audio('http://localhost/someurl').preload is "auto"
+PASS new Audio('http://0.0.0.0/someurl').src is "http://0.0.0.0/someurl"
+PASS new Audio('http://0.0.0.0/someurl').preload is "auto"
 PASS successfullyParsed is true
 
 TEST COMPLETE

diff --git a/LayoutTests/fast/js/script-tests/custom-constructors.js b/LayoutTests/fast/js/script-tests/custom-constructors.js
index d51cdf3..2d11e99 100644 (file)
--- a/LayoutTests/fast/js/script-tests/custom-constructors.js
+++ b/LayoutTests/fast/js/script-tests/custom-constructors.js
@@ -53,5 +53,5 @@ shouldBeEqualToString("new Audio().tagName", "AUDIO");
 
 shouldBeEqualToString("new Audio().src", "");
 shouldBeEqualToString("new Audio().preload", "auto");
-shouldBeEqualToString("new Audio('http://localhost/someurl').src", "http://localhost/someurl");
-shouldBeEqualToString("new Audio('http://localhost/someurl').preload", "auto");
+shouldBeEqualToString("new Audio('http://0.0.0.0/someurl').src", "http://0.0.0.0/someurl");
+shouldBeEqualToString("new Audio('http://0.0.0.0/someurl').preload", "auto");

diff --git a/LayoutTests/fast/notifications/notifications-double-show-expected.txt b/LayoutTests/fast/notifications/notifications-double-show-expected.txt
index 3a692d6..7c12f26 100644 (file)
--- a/LayoutTests/fast/notifications/notifications-double-show-expected.txt
+++ b/LayoutTests/fast/notifications/notifications-double-show-expected.txt
@@ -1,4 +1,4 @@
-DESKTOP NOTIFICATION: icon http://localhost/my_icon.png, title New E-mail, text Meet me tonight at 8!
+DESKTOP NOTIFICATION: icon http://0.0.0.0/my_icon.png, title New E-mail, text Meet me tonight at 8!
 Sending notifications...
 
 

diff --git a/LayoutTests/fast/notifications/notifications-double-show.html b/LayoutTests/fast/notifications/notifications-double-show.html
index 3a7db70..23a7cdf 100644 (file)
--- a/LayoutTests/fast/notifications/notifications-double-show.html
+++ b/LayoutTests/fast/notifications/notifications-double-show.html
@@ -19,7 +19,7 @@
                 log("FAIL: No webkitNotifications interface!");
             }
             
-            var N = window.webkitNotifications.createNotification("http://localhost/my_icon.png", "New E-mail", "Meet me tonight at 8!");
+            var N = window.webkitNotifications.createNotification("http://0.0.0.0/my_icon.png", "New E-mail", "Meet me tonight at 8!");
             N.ondisplay = function() { layoutTestController.notifyDone(); }
             N.show();
             N.show();

diff --git a/LayoutTests/fast/notifications/notifications-with-permission-expected.txt b/LayoutTests/fast/notifications/notifications-with-permission-expected.txt
index ec41d26..de87f9f 100644 (file)
--- a/LayoutTests/fast/notifications/notifications-with-permission-expected.txt
+++ b/LayoutTests/fast/notifications/notifications-with-permission-expected.txt
@@ -1,5 +1,5 @@
-DESKTOP NOTIFICATION: contents at http://localhost/my_notification.html
-DESKTOP NOTIFICATION: icon http://localhost/my_icon.png, title New E-mail, text Meet me tonight at 8!
+DESKTOP NOTIFICATION: contents at http://0.0.0.0/my_notification.html
+DESKTOP NOTIFICATION: icon http://0.0.0.0/my_icon.png, title New E-mail, text Meet me tonight at 8!
 Sending notifications with permission...
 
 

diff --git a/LayoutTests/fast/notifications/notifications-with-permission.html b/LayoutTests/fast/notifications/notifications-with-permission.html
index b806f21..a24be85 100644 (file)
--- a/LayoutTests/fast/notifications/notifications-with-permission.html
+++ b/LayoutTests/fast/notifications/notifications-with-permission.html
@@ -19,10 +19,10 @@
                 log("FAIL: No webkitNotifications interface!");
             }
             
-            var N = window.webkitNotifications.createHTMLNotification("http://localhost/my_notification.html");
+            var N = window.webkitNotifications.createHTMLNotification("http://0.0.0.0/my_notification.html");
             N.show();
             
-            var M = window.webkitNotifications.createNotification("http://localhost/my_icon.png", "New E-mail", "Meet me tonight at 8!");
+            var M = window.webkitNotifications.createNotification("http://0.0.0.0/my_icon.png", "New E-mail", "Meet me tonight at 8!");
             M.ondisplay = function() { layoutTestController.notifyDone(); }
             M.show();
         }

diff --git a/LayoutTests/fast/notifications/notifications-without-permission.html b/LayoutTests/fast/notifications/notifications-without-permission.html
index e2d7511..2573a6a 100644 (file)
--- a/LayoutTests/fast/notifications/notifications-without-permission.html
+++ b/LayoutTests/fast/notifications/notifications-without-permission.html
@@ -19,7 +19,7 @@
             }
             
             try {
-                var N = window.webkitNotifications.createNotification("http://localhost/my_icon.png", "New E-mail", "Meet me tonight at 8!");
+                var N = window.webkitNotifications.createNotification("http://0.0.0.0/my_icon.png", "New E-mail", "Meet me tonight at 8!");
                 N.show();
                 log("FAIL: Should have thrown security exception.");
             } catch (e) {