Merge "Revert "(bug 24620) Add tests for LogFormatter""

diff --git a/CREDITS b/CREDITS
index 6555b07..217109a 100644 (file)
--- a/CREDITS
+++ b/CREDITS
@@ -85,6 +85,7 @@ following names for their contribution to the product.
 * Agbad
 * Ahmad Sherif
 * Alejandro Mery
+* Alexander Monk
 * Amalthea
 * Amir E. Aharoni
 * Andrew Dunbar
@@ -129,7 +130,6 @@ following names for their contribution to the product.
 * John N
 * Karun Dambiec
 * Kim Hyun-Joon
-* Krenair
 * Lee Worden
 * Lejonel
 * liangent

diff --git a/tests/phpunit/StructureTest.php b/tests/phpunit/StructureTest.php
index 17ea06c..dfbcc9d 100644 (file)
--- a/tests/phpunit/StructureTest.php
+++ b/tests/phpunit/StructureTest.php
@@ -8,6 +8,7 @@ class StructureTest extends MediaWikiTestCase {
        /**
         * Verify all files that appear to be tests have file names ending in
         * Test.  If the file names do not end in Test, they will not be run.
+        * @group medium
         */
        public function testUnitTestFileNamesEndWithTest() {
                if ( wfIsWindows() ) {