From b422c7e45f6e9f357c5f9f257a16337943f4a00e Mon Sep 17 00:00:00 2001 From: John Blackbourn Date: Mon, 11 Sep 2017 00:37:55 +0000 Subject: [PATCH] Build/Test Tools: Convert more test skipping into hard failures. See #41851 git-svn-id: https://develop.svn.wordpress.org/trunk@41367 602fd350-edb4-49c9-b593-d223f7449a82 --- tests/phpunit/tests/http/http.php | 5 ----- tests/phpunit/tests/image/meta.php | 5 +++-- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/tests/phpunit/tests/http/http.php b/tests/phpunit/tests/http/http.php index 78b9f85e87..f4cb6a99ac 100644 --- a/tests/phpunit/tests/http/http.php +++ b/tests/phpunit/tests/http/http.php @@ -12,11 +12,6 @@ class Tests_HTTP_HTTP extends WP_UnitTestCase { * @dataProvider make_absolute_url_testcases */ function test_make_absolute_url( $relative_url, $absolute_url, $expected ) { - if ( ! is_callable( array( 'WP_Http', 'make_absolute_url' ) ) ) { - $this->markTestSkipped( "This version of WP_HTTP doesn't support WP_HTTP::make_absolute_url()" ); - return; - } - $actual = WP_Http::make_absolute_url( $relative_url, $absolute_url ); $this->assertEquals( $expected, $actual ); } diff --git a/tests/phpunit/tests/image/meta.php b/tests/phpunit/tests/image/meta.php index f132d90d4e..9d05c03da9 100644 --- a/tests/phpunit/tests/image/meta.php +++ b/tests/phpunit/tests/image/meta.php @@ -8,9 +8,10 @@ class Tests_Image_Meta extends WP_UnitTestCase { function setUp() { if ( ! extension_loaded( 'gd' ) ) - $this->markTestSkipped( 'The gd PHP extension is not loaded.' ); + $this->fail( 'The gd PHP extension is not loaded.' ); if ( ! extension_loaded( 'exif' ) ) - $this->markTestSkipped( 'The exif PHP extension is not loaded.' ); + $this->fail( 'The exif PHP extension is not loaded.' ); + parent::setUp(); }