Changeset 710 in tests for wp-testlib/base.php

Timestamp:

05/03/2012 04:40:01 PM (13 years ago)

Author:

nacin

Message:

Move the tearDown() output buffering flush-all from WPXMLRPCServerTestCase
to WPTestCase, for which [625] was intended.

Do not flush the last output buffer, as PHPUnit does one level of output
buffering in PHPUnit_Framework_TestCase. This prevents a notice from being
issued when WordPress has flushed all output buffers, then PHPUnit
unconditionally calls ob_end_clean() for its own output buffer.

File:

• wp-testlib/base.php (modified) (2 diffs)

wp-testlib/base.php

@@ -38 +38 @@
 
     function tearDown() {
+        // Multi-level flush, when necessary, if a test did not clean up after themselves.
+        // Avoid flushing the main PHPUnit buffer.
+        $levels = ob_get_level();
+        for ( $i = 1; $i < $levels; $i++ )
+            ob_end_flush();
+
         if (!is_null($this->_old_handler)) {
             restore_error_handler();
@@ -651 +657 @@
 
     function tearDown() {
-        // Multi-level flush, when necessary, if a test did not clean up after themselves
-        wp_ob_end_flush_all();
         parent::tearDown();
         // delete any users and uploads that were created during tests