Merge "Set default to 1 recent contributor instead of -1"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 21 Apr 2017 18:15:59 +0000 (18:15 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 21 Apr 2017 18:15:59 +0000 (18:15 +0000)
1  2 
tests/phpunit/includes/db/DatabaseSqliteTest.php

@@@ -1,8 -1,6 +1,8 @@@
  <?php
  
  use Wikimedia\Rdbms\Blob;
 +use Wikimedia\Rdbms\Database;
 +use Wikimedia\Rdbms\DatabaseSqlite;
  
  class DatabaseSqliteMock extends DatabaseSqlite {
        private $lastQuery;
@@@ -311,6 -309,7 +311,7 @@@ class DatabaseSqliteTest extends MediaW
                // Mismatches for these columns we can safely ignore
                $ignoredColumns = [
                        'user_newtalk.user_last_timestamp', // r84185
+                       'site_stats.ss_active_users', // T56888
                ];
  
                $currentDB = DatabaseSqlite::newStandaloneInstance( ':memory:' );