From: Priyanka Dhanda <pdhanda@users.mediawiki.org>
Date: Fri, 17 Sep 2010 23:36:52 +0000 (+0000)
Subject: Some changes so that tests don't die silently on ci.
X-Git-Tag: 1.31.0-rc.0~34883
X-Git-Url: http://git.cyclocoop.org/%28?a=commitdiff_plain;h=07b3f007be7fd5e3d6c12aaf9e05d5d1e21c33b4;p=lhc%2Fweb%2Fwiklou.git

Some changes so that tests don't die silently on ci.
---

diff --git a/maintenance/tests/phpunit/includes/MessageTest.php b/maintenance/tests/phpunit/includes/MessageTest.php
index 6c5580294e..2228b75396 100644
--- a/maintenance/tests/phpunit/includes/MessageTest.php
+++ b/maintenance/tests/phpunit/includes/MessageTest.php
@@ -3,9 +3,13 @@
 class MessageTest extends PHPUnit_Framework_TestCase {
 
 	function setUp() {
-		global $wgLanguageCode;
-		
+		global $wgLanguageCode, $wgLang, $wgContLang, $wgMemc, $wgMessageCache;
+
 		$wgLanguageCode = 'en'; # For mainpage to be 'Main Page'
+		//Some test set this to a Stub Object. For this test we need the real deal
+		$wgContLang = $wgLang = Language::factory( $wgLanguageCode );
+		$wgMemc = new FakeMemCachedClient;
+		$wgMessageCache = new MessageCache( $wgMemc, true, 3600 );
 	}
 
 	function testExists() {
diff --git a/maintenance/tests/phpunit/includes/db/DatabaseSqliteTest.php b/maintenance/tests/phpunit/includes/db/DatabaseSqliteTest.php
index 29ce6383be..cbeaae4b78 100644
--- a/maintenance/tests/phpunit/includes/db/DatabaseSqliteTest.php
+++ b/maintenance/tests/phpunit/includes/db/DatabaseSqliteTest.php
@@ -22,7 +22,7 @@ class DatabaseSqliteTest extends PHPUnit_Framework_TestCase {
 
 	function setup() {
 		if ( !Sqlite::isPresent() ) {
-			$this->markTestIncomplete( 'No SQLite support detected' );
+			$this->markTestSkipped( 'No SQLite support detected' );
 		}
 		$this->db = new MockDatabaseSqlite();
 	}