http://www.mediawiki.org/wiki/Special:Code/MediaWiki/73260

Revision: 73260
Author:   pdhanda
Date:     2010-09-17 23:36:52 +0000 (Fri, 17 Sep 2010)

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

Modified Paths:
--------------
    trunk/phase3/maintenance/tests/phpunit/includes/MessageTest.php
    trunk/phase3/maintenance/tests/phpunit/includes/db/DatabaseSqliteTest.php

Modified: trunk/phase3/maintenance/tests/phpunit/includes/MessageTest.php
===================================================================
--- trunk/phase3/maintenance/tests/phpunit/includes/MessageTest.php     
2010-09-17 23:36:09 UTC (rev 73259)
+++ trunk/phase3/maintenance/tests/phpunit/includes/MessageTest.php     
2010-09-17 23:36:52 UTC (rev 73260)
@@ -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() {

Modified: 
trunk/phase3/maintenance/tests/phpunit/includes/db/DatabaseSqliteTest.php
===================================================================
--- trunk/phase3/maintenance/tests/phpunit/includes/db/DatabaseSqliteTest.php   
2010-09-17 23:36:09 UTC (rev 73259)
+++ trunk/phase3/maintenance/tests/phpunit/includes/db/DatabaseSqliteTest.php   
2010-09-17 23:36:52 UTC (rev 73260)
@@ -22,7 +22,7 @@
 
        function setup() {
                if ( !Sqlite::isPresent() ) {
-                       $this->markTestIncomplete( 'No SQLite support detected' 
);
+                       $this->markTestSkipped( 'No SQLite support detected' );
                }
                $this->db = new MockDatabaseSqlite();
        }



_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to