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 6c55802..2228b75 100644 (file)
--- 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 29ce638..cbeaae4 100644 (file)
--- 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();
        }