Merge "Remove deprecated functions from ChangeTags class"

diff --git a/tests/parser/ParserTestRunner.php b/tests/parser/ParserTestRunner.php
index f0c815f..28335ec 100644 (file)
--- a/tests/parser/ParserTestRunner.php
+++ b/tests/parser/ParserTestRunner.php
@@ -1108,6 +1108,7 @@ class ParserTestRunner {
 
                // Set content language. This invalidates the magic word cache and title services
                $lang = Language::factory( $langCode );
+               $lang->resetNamespaces();
                $setup['wgContLang'] = $lang;
                $reset = function () {
                        MagicWord::clearCache();

diff --git a/tests/phpunit/includes/api/ApiBlockTest.php b/tests/phpunit/includes/api/ApiBlockTest.php
index c0cf87e..c456e9a 100644 (file)
--- a/tests/phpunit/includes/api/ApiBlockTest.php
+++ b/tests/phpunit/includes/api/ApiBlockTest.php
@@ -207,7 +207,7 @@ class ApiBlockTest extends ApiTestCase {
                );
 
                // Allow flakiness up to one second
-               $this->assertLessThan( 1,
+               $this->assertLessThanOrEqual( 1,
                        abs( wfTimestamp( TS_UNIX, $expiry ) - ( time() + 86400 ) ) );
        }