Changeset 47332 for branches/4.1

Timestamp:

02/20/2020 05:44:32 PM (5 years ago)

Author:

SergeyBiryukov

Message:

Build/Test Tools: Merge some test fixes to the 4.1 branch, for consistency with other branches.

This backports [31253-31254], [31257].

See #49485.

Location:

branches/4.1

Files:

• . (modified) (1 prop)
• tests/phpunit/tests/export/functions.export.php (deleted)
• tests/phpunit/tests/export/writers.php (deleted)
• tests/phpunit/tests/image/resize.php (modified) (1 diff)
• tests/phpunit/tests/image/resize_gd.php (modified) (1 diff)
• tests/phpunit/tests/iterators.php (deleted)

branches/4.1/tests/phpunit/tests/image/resize.php

@@ -149 +149 @@
 
     /**
-     * Try resizing a php file (bad image)
-     * @ticket 6821
-     */
-    public function test_resize_bad_image() {
-
-        if ( $this->editor_engine == 'WP_Image_Editor_Imagick' ) {
-            $this->markTestSkipped( sprintf( 'Avoid GLib-GObject-CRITICAL assertion in %s', $this->editor_engine ) );
-            return;
-        }
-
-        $image = $this->resize_helper( DIR_TESTDATA.'/export/crazy-cdata.xml', 25, 25 );
-        $this->assertInstanceOf( 'WP_Error', $image );
-        $this->assertEquals( 'invalid_image', $image->get_error_code() );
-    }
-
-
-    /**
      * Function to help out the tests
      */

branches/4.1/tests/phpunit/tests/image/resize_gd.php

@@ -23 +23 @@
         parent::setUp();
     }
+
+    /**
+     * Try resizing a php file (bad image)
+     * @ticket 6821
+     */
+    public function test_resize_bad_image() {
+
+        $image = $this->resize_helper( DIR_TESTDATA.'/export/crazy-cdata.xml', 25, 25 );
+        $this->assertInstanceOf( 'WP_Error', $image );
+        $this->assertEquals( 'invalid_image', $image->get_error_code() );
+    }
+
 }