From 07b3f007be7fd5e3d6c12aaf9e05d5d1e21c33b4 Mon Sep 17 00:00:00 2001 From: Priyanka Dhanda Date: Fri, 17 Sep 2010 23:36:52 +0000 Subject: [PATCH] Some changes so that tests don't die silently on ci. --- maintenance/tests/phpunit/includes/MessageTest.php | 8 ++++++-- .../tests/phpunit/includes/db/DatabaseSqliteTest.php | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) 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(); } -- 2.20.1