Merge "Reset interwiki table between tests"

diff --combined tests/phpunit/MediaWikiTestCase.php
index 382bf50,0b7481b..af6acad
--- 1/tests/phpunit/MediaWikiTestCase.php
--- 2/tests/phpunit/MediaWikiTestCase.php
+++ b/tests/phpunit/MediaWikiTestCase.php
@@@ -97,6 -97,12 +97,12 @@@ abstract class MediaWikiTestCase extend
         */
        private $mwGlobalsToUnset = [];
  
+       /**
+        * Holds original contents of interwiki table
+        * @var IResultWrapper
+        */
+       private $interwikiTable = null;
+ 
        /**
         * Holds original loggers which have been replaced by setLogger()
         * @var LoggerInterface[]
@@@ -563,6 -569,12 +569,12 @@@
                        }
                }
  
+               // Store contents of interwiki table in case it changes.  Unfortunately, we seem to have no
+               // way to do this only when needed, because tablesUsed can be changed mid-test.
+               if ( $this->db ) {
+                       $this->interwikiTable = $this->db->select( 'interwiki', '*', '', __METHOD__ );
+               }
+ 
                // Reset all caches between tests.
                $this->doLightweightServiceReset();
  
@@@ -1707,11 -1719,6 +1719,6 @@@
  
                        $truncate = in_array( $db->getType(), [ 'oracle', 'mysql' ] );
                        foreach ( $tablesUsed as $tbl ) {
-                               // TODO: reset interwiki table to its original content.
-                               if ( $tbl == 'interwiki' ) {
-                                       continue;
-                               }
- 
                                if ( !$db->tableExists( $tbl ) ) {
                                        continue;
                                }
@@@ -1727,6 -1734,19 +1734,19 @@@
                                        $db->resetSequenceForTable( $tbl, __METHOD__ );
                                }
  
+                               if ( $tbl === 'interwiki' ) {
+                                       if ( !$this->interwikiTable ) {
+                                               // @todo We should probably throw here, but this causes test failures that I
+                                               // can't figure out, so for now we silently continue.
+                                               continue;
+                                       }
+                                       $db->insert(
+                                               'interwiki',
+                                               array_map( 'get_object_vars', iterator_to_array( $this->interwikiTable ) ),
+                                               __METHOD__
+                                       );
+                               }
+ 
                                if ( $tbl === 'page' ) {
                                        // Forget about the pages since they don't
                                        // exist in the DB.
@@@ -2170,18 -2190,6 +2190,18 @@@
                return $loaded;
        }
  
 +      /**
 +       * Skip the test if using the specified database type
 +       *
 +       * @param string $type Database type
 +       * @since 1.32
 +       */
 +      protected function markTestSkippedIfDbType( $type ) {
 +              if ( $this->db->getType() === $type ) {
 +                      $this->markTestSkipped( "The $type database type isn't supported for this test" );
 +              }
 +      }
 +
        /**
         * Used as a marker to prevent wfResetOutputBuffers from breaking PHPUnit.
         * @param string $buffer