Changeset 35211

Timestamp:

10/15/2015 09:30:52 PM (11 years ago)

Author:

ocean90

Message:

Tests: Remove the @runTestsInSeparateProcesses annotation for Ajax tests.

They were added 3 years ago in [846/tests] because tests weren't excluded from the normal runs.

Reverts [35209] because it doesn't work with Xdebug.
Tests_Ajax_Response::test_response_charset_in_header is the only test which needs to run in a separate process, see [975/tests].

See #31491.

Location:

trunk/tests/phpunit

Files:

• includes/testcase-ajax.php (modified) (1 diff)
• tests/ajax/Autosave.php (modified) (1 diff)
• tests/ajax/Compression.php (modified) (1 diff)
• tests/ajax/CustomizeMenus.php (modified) (1 diff)
• tests/ajax/Response.php (modified) (2 diffs)

trunk/tests/phpunit/includes/testcase-ajax.php

@@ -50 +50 @@
                 'wp-remove-post-lock', 'dismiss-wp-pointer', 'heartbeat', 'nopriv_heartbeat',
         );
-
-        /**
-         * Don't preserve the global state when using an external object cache.
-         *
-         * Most of the Ajax tests are running in a separate PHP process, and thus PHPUnit attempts
-         * to preserve the global state from the parent process by serializing all globals.
-         * But this doesn't work for external object caches so we have to disable this "feature".
-         */
-        public function run( PHPUnit_Framework_TestResult $result = NULL ) {
-                if ( wp_using_ext_object_cache() ) {
-                        $this->setPreserveGlobalState( false );
-                }
-
-                return parent::run( $result );
-        }
 
         /**

trunk/tests/phpunit/tests/ajax/Autosave.php

@@ -13 +13 @@
  * @since      3.4.0
  * @group      ajax
- * @runTestsInSeparateProcesses
  */
 class Tests_Ajax_Autosave extends WP_Ajax_UnitTestCase {

trunk/tests/phpunit/tests/ajax/Compression.php

@@ -13 +13 @@
  * @since      3.4.0
  * @group      ajax
- * @runTestsInSeparateProcesses
  */
 class Tests_Ajax_CompressionTest extends WP_Ajax_UnitTestCase {

trunk/tests/phpunit/tests/ajax/CustomizeMenus.php

@@ -7 +7 @@
  * @since      4.3.0
  * @group      ajax
- * @runTestsInSeparateProcesses
  */
 class Tests_Ajax_CustomizeMenus extends WP_Ajax_UnitTestCase {

trunk/tests/phpunit/tests/ajax/Response.php

@@ -7 +7 @@
  * @since      3.5.0
  * @group      ajax
- * @runInSeparateProcess
  */
 class Tests_Ajax_Response extends WP_UnitTestCase {
@@ -66 +65 @@
          * bootstrapper
          * @ticket 19448
+         * @runInSeparateProcess
+         * @preserveGlobalState disabled
          */
         public function test_response_charset_in_header() {