Changeset 38016

Timestamp:

07/08/2016 06:16:07 PM (9 years ago)

Author:

ocean90

Message:

Unit tests: Don't change the memory_limit setting during tests.

40M isn't enough and can lead to an "out of memory" error. Change test_wp_raise_memory_limit() to test that wp_raise_memory_limit() doesn't *lower* the memory limit.

See [38015].
See #32075.

File:

• trunk/tests/phpunit/tests/functions.php (modified) (1 diff)

trunk/tests/phpunit/tests/functions.php

@@ -876 +876 @@
      */
     function test_wp_raise_memory_limit() {
-        ini_set( 'memory_limit', '40M' );
-        $this->assertSame( -1, wp_raise_memory_limit() );
-        $this->assertEquals( '-1', ini_get( 'memory_limit' ) );
+        if ( -1 !== WP_MAX_MEMORY_LIMIT ) {
+            $this->markTestSkipped( 'WP_MAX_MEMORY_LIMIT should be set to -1' );
+        }
+
+        $ini_limit_before = ini_get( 'memory_limit' );
+        $raised_limit = wp_raise_memory_limit();
+        $ini_limit_after = ini_get( 'memory_limit' );
+
+        $this->assertSame( $ini_limit_before, $ini_limit_after );
+        $this->assertSame( false, $raised_limit );
+        $this->assertEquals( WP_MAX_MEMORY_LIMIT, $ini_limit_after );
     }
 }