sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Build/Test Tools: Remove ancient UT ticket handling for the 4.7 branch.

Browse Source 
See #40533

Merges [40523] to the 4.7 branch.


git-svn-id: https://develop.svn.wordpress.org/branches/4.7@41305 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
John Blackbourn 2017-08-22 19:58:16 +00:00
parent 0935a18cc7
commit f780dd4734
3 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tests/phpunit/includes/testcase.php
View File

@ -555,10 +555,6 @@ class WP_UnitTestCase extends PHPUnit_Framework_TestCase {
foreach ( $tickets as $ticket ) { foreach ( $tickets as $ticket ) {
if ( is_numeric( $ticket ) ) { if ( is_numeric( $ticket ) ) {
$this->knownWPBug( $ticket ); $this->knownWPBug( $ticket );
} elseif ( 'UT' == substr( $ticket, 0, 2 ) ) {
$ticket = substr( $ticket, 2 );
if ( $ticket && is_numeric( $ticket ) )
$this->knownUTBug( $ticket );
} elseif ( 'Plugin' == substr( $ticket, 0, 6 ) ) { } elseif ( 'Plugin' == substr( $ticket, 0, 6 ) ) {
$ticket = substr( $ticket, 6 ); $ticket = substr( $ticket, 6 );
if ( $ticket && is_numeric( $ticket ) ) if ( $ticket && is_numeric( $ticket ) )
@ -578,13 +574,10 @@ class WP_UnitTestCase extends PHPUnit_Framework_TestCase {
} }
/** /**
* Skips the current test if there is an open unit tests ticket with id $ticket_id * @deprecated No longer used since the unit test Trac was merged into Core's.
*/ */
function knownUTBug( $ticket_id ) { function knownUTBug( $ticket_id ) {
if ( WP_TESTS_FORCE_KNOWN_BUGS || in_array( 'UT' . $ticket_id, self::$forced_tickets ) ) return;
return;
if ( ! TracTickets::isTracTicketClosed( 'https://unit-tests.trac.wordpress.org', $ticket_id ) )
$this->markTestSkipped( sprintf( 'Unit Tests Ticket #%d is not fixed', $ticket_id ) );
} }
/** /**

3
tests/phpunit/tests/feed/rss2.php
View File

@ -162,9 +162,6 @@ class Tests_Feeds_RSS2 extends WP_UnitTestCase {
$this->assertNotContains( 'Tue_Translated', $pubdate[0]['content'] ); $this->assertNotContains( 'Tue_Translated', $pubdate[0]['content'] );
} }
/**
* @ticket UT32
*/
function test_item_elements() { function test_item_elements() {
$this->go_to( '/?feed=rss2' ); $this->go_to( '/?feed=rss2' );
$feed = $this->do_rss2(); $feed = $this->do_rss2();

4
tests/phpunit/tests/upload.php
View File

@ -8,10 +8,6 @@ class Tests_Upload extends WP_UnitTestCase {
var $siteurl; var $siteurl;
function setUp() { function setUp() {
if ( is_multisite() ) {
$this->knownUTBug( 35 );
}
$this->_reset_options(); $this->_reset_options();
parent::setUp(); parent::setUp();
} }