From: Brion Vibber <brion@users.mediawiki.org>
Date: Wed, 1 Jun 2011 21:25:45 +0000 (+0000)
Subject: Tweak HttpTest following r89278:
X-Git-Tag: 1.31.0-rc.0~29795
X-Git-Url: https://git.cyclocoop.org/%28%28?a=commitdiff_plain;h=538578bddefae205d8aaa329c0aef76c229f77a2;p=lhc%2Fweb%2Fwiklou.git

Tweak HttpTest following r89278:
* remove FTP test case URL (shouldn't actually work, and as a directory listing, not super stable)
* remove old test case URLs that are now 30x redirects (example.com and a toolserver link), which broke the comparison tests
* added in http://en.wikipedia.org/robots.txt so we've got a nice basic fetch on one of our servers too

Now this test class is down to 3 failures, in URL & domain validation stuff
---

diff --git a/tests/phpunit/includes/HttpTest.php b/tests/phpunit/includes/HttpTest.php
index c489ebb2ae..825437a9a1 100644
--- a/tests/phpunit/includes/HttpTest.php
+++ b/tests/phpunit/includes/HttpTest.php
@@ -17,11 +17,9 @@ class HttpTest extends MediaWikiTestCase {
 	static $has_proxy = false;
 	static $proxy = "http://hulk:8080/";
 	var $test_geturl = array(
-		"ftp://ftp.kernel.org/",
-		"http://www.example.com/",
+		"http://en.wikipedia.org/robots.txt",
 		"https://secure.wikimedia.org/",
 		"http://pecl.php.net/feeds/pkg_apc.rss",
-		"http://toolserver.org/~jan/poll/dev/main.php?page=wiki_output&id=3",
 		"http://meta.wikimedia.org/w/index.php?title=Interwiki_map&action=raw",
 		"http://www.mediawiki.org/w/api.php?action=query&list=categorymembers&cmtitle=Category:MediaWiki_hooks&format=php",
 	);