From 950b185aa72e1e94900509190015ccc133b195c1 Mon Sep 17 00:00:00 2001 From: John Blackbourn Date: Sat, 22 Apr 2017 19:42:12 +0000 Subject: [PATCH] Build/Test Tools: Remove more skipped tests that should actually be failures if their conditions aren't satisfied. See #40533 git-svn-id: https://develop.svn.wordpress.org/trunk@40524 602fd350-edb4-49c9-b593-d223f7449a82 --- tests/phpunit/tests/db.php | 2 +- tests/phpunit/tests/http/base.php | 2 +- tests/phpunit/tests/theme.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/phpunit/tests/db.php b/tests/phpunit/tests/db.php index 9595d3df18..0c24c59040 100644 --- a/tests/phpunit/tests/db.php +++ b/tests/phpunit/tests/db.php @@ -87,7 +87,7 @@ class Tests_DB extends WP_UnitTestCase { // Switch to Russian $flag = setlocale( LC_ALL, 'ru_RU.utf8', 'rus', 'fr_FR.utf8', 'fr_FR', 'de_DE.utf8', 'de_DE', 'es_ES.utf8', 'es_ES' ); if ( false === $flag ) - $this->markTestSkipped( 'No European languages available for testing' ); + $this->fail( 'No European languages available for testing' ); // Try an update query $wpdb->suppress_errors( true ); diff --git a/tests/phpunit/tests/http/base.php b/tests/phpunit/tests/http/base.php index a546fb778e..a8792783d8 100644 --- a/tests/phpunit/tests/http/base.php +++ b/tests/phpunit/tests/http/base.php @@ -384,7 +384,7 @@ abstract class WP_HTTP_UnitTestCase extends WP_UnitTestCase { */ function test_ssl() { if ( ! wp_http_supports( array( 'ssl' ) ) ) - $this->markTestSkipped( 'This install of PHP does not support SSL' ); + $this->fail( 'This install of PHP does not support SSL' ); $res = wp_remote_get( 'https://wordpress.org/' ); $this->assertNotWPError( $res ); diff --git a/tests/phpunit/tests/theme.php b/tests/phpunit/tests/theme.php index 2e76f7c80e..452a836668 100644 --- a/tests/phpunit/tests/theme.php +++ b/tests/phpunit/tests/theme.php @@ -189,7 +189,7 @@ class Tests_Theme extends WP_UnitTestCase { function test_default_theme_in_default_theme_list() { $latest_default_theme = WP_Theme::get_core_default_theme(); if ( ! $latest_default_theme->exists() || 'twenty' !== substr( $latest_default_theme->get_stylesheet(), 0, 6 ) ) { - $this->markTestSkipped( 'No Twenty* series default themes are installed' ); + $this->fail( 'No Twenty* series default themes are installed' ); } $this->assertContains( $latest_default_theme->get_stylesheet(), $this->default_themes ); }