summaryrefslogtreecommitdiffstatshomepage
path: root/tests/phpunit/includes
diff options
context:
space:
mode:
authorJohn Blackbourn <johnbillion@git.wordpress.org>2017-04-22 17:29:03 +0000
committerJohn Blackbourn <johnbillion@git.wordpress.org>2017-04-22 17:29:03 +0000
commit2eb8cb7ca2d4793658115c6adb93460fe9b78097 (patch)
tree6cf967263e86ad608ad806cb7f699ae319ff0bf1 /tests/phpunit/includes
parent58b60158c7c49cb0507de333ba131b7c9cbd6cb9 (diff)
downloadwordpress-2eb8cb7ca2d4793658115c6adb93460fe9b78097.tar.gz
wordpress-2eb8cb7ca2d4793658115c6adb93460fe9b78097.zip
Canonical: Don't skip tests if the test data is invalid.
See #40533 git-svn-id: https://develop.svn.wordpress.org/trunk@40517 602fd350-edb4-49c9-b593-d223f7449a82
Diffstat (limited to 'tests/phpunit/includes')
-rw-r--r--tests/phpunit/includes/testcase-canonical.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/phpunit/includes/testcase-canonical.php b/tests/phpunit/includes/testcase-canonical.php
index e0b93c8511..2ffbc982eb 100644
--- a/tests/phpunit/includes/testcase-canonical.php
+++ b/tests/phpunit/includes/testcase-canonical.php
@@ -168,7 +168,7 @@ class WP_Canonical_UnitTestCase extends WP_UnitTestCase {
$expected = array( 'qv' => $expected );
if ( !isset($expected['url']) && !isset($expected['qv']) )
- $this->markTestSkipped('No valid expected output was provided');
+ $this->fail( 'No valid expected output was provided' );
$this->go_to( home_url( $test_url ) );
@@ -181,6 +181,7 @@ class WP_Canonical_UnitTestCase extends WP_UnitTestCase {
$this->assertEquals( $expected['url'], $parsed_can_url['path'] . (!empty($parsed_can_url['query']) ? '?' . $parsed_can_url['query'] : ''), $ticket_ref );
}
+ // If the test data doesn't include expected query vars, then we're done here
if ( ! isset($expected['qv']) )
return;