Use __DIR__ instead of dirname( __FILE__ )

[lhc/web/wiklou.git] / tests / phpunit / maintenance / backupPrefetchTest.php

diff --git a/tests/phpunit/maintenance/backupPrefetchTest.php b/tests/phpunit/maintenance/backupPrefetchTest.php
index 0d3f933..8ff8557 100644 (file)
--- a/tests/phpunit/maintenance/backupPrefetchTest.php
+++ b/tests/phpunit/maintenance/backupPrefetchTest.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname( __FILE__ ) . "/../../../maintenance/backupPrefetch.inc";
+require_once __DIR__ . "/../../../maintenance/backupPrefetch.inc";
 
 /**
  * Tests for BaseDump
@@ -17,11 +17,13 @@ class BaseDumpTest extends MediaWikiTestCase {
        private $dump = null;
 
        protected function tearDown() {
-               parent::tearDown();
-
                if ( $this->dump !== null ) {
                        $this->dump->close();
                }
+
+               // Bug 37458, parent teardown need to be done after closing the
+               // dump or it might cause some permissions errors.
+               parent::tearDown();
        }
 
        /**
@@ -217,6 +219,7 @@ class BaseDumpTest extends MediaWikiTestCase {
     </revision>
     <revision>
       <id>5</id>
+      <parentid>2</parentid>
       <timestamp>2012-04-01T16:46:05Z</timestamp>
       <contributor>
         <ip>127.0.0.1</ip>