<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[59327] branches/6.7/tests/phpunit/tests/import: Tests/Build tools: Only fail importer tests if plugin is missing.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/59327">59327</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/59327","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>peterwilsoncc</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2024-10-30 23:45:53 +0000 (Wed, 30 Oct 2024)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Tests/Build tools: Only fail importer tests if plugin is missing.
Reverts an earlier change to the test suite in which the PHPUnit tests could not run if the importer plugin was not available.
This update allows the test suite to run and will fail importer tests if the plugin is not available.
Follow up to <a href="https://core.trac.wordpress.org/changeset/59085">r59085</a>.
Merges <a href="https://core.trac.wordpress.org/changeset/59326">[59326]</a> to the 6.7 branch.
Props peterwilsoncc, azaozz.
See <a href="https://core.trac.wordpress.org/ticket/62325">#62325</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches67testsphpunitincludesbootstrapphp">branches/6.7/tests/phpunit/includes/bootstrap.php</a></li>
<li><a href="#branches67testsphpunittestsimportbasephp">branches/6.7/tests/phpunit/tests/import/base.php</a></li>
<li><a href="#branches67testsphpunittestsimportimportphp">branches/6.7/tests/phpunit/tests/import/import.php</a></li>
<li><a href="#branches67testsphpunittestsimportparserphp">branches/6.7/tests/phpunit/tests/import/parser.php</a></li>
<li><a href="#branches67testsphpunittestsimportpostmetaphp">branches/6.7/tests/phpunit/tests/import/postmeta.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branches67">branches/6.7/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx" style="display: block; padding: 0 10px">Index: branches/6.7
</span><span class="cx" style="display: block; padding: 0 10px">===================================================================
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">--- branches/6.7 2024-10-30 23:27:08 UTC (rev 59326)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ branches/6.7 2024-10-30 23:45:53 UTC (rev 59327)
</ins><a id="branches67"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: branches/6.7</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: svn:mergeinfo</h4></div>
<span class="cx" style="display: block; padding: 0 10px"> /branches/5.0:43681-43682,43684-43688,43719-43720,43723,43726-43727,43729-43731,43734-43744,43747,43751-43754,43758,43760-43765,43767-43770,43772,43774-43781,43783,43785,43790-43806,43808-43821,43825,43828,43830-43834,43836-43843,43846-43863,43867-43889,43891-43894,43897-43905,43908-43909,43911-43929,43931-43942,43946-43947,43949-43956,43959-43964,43967-43969,43988,43994,44014,44017,44047,44183,44185,44187-44206,44208-44213,44231-44232,44235,44248,44284,44287-44288
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/5.5:49373-49379,49381
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/5.8:51889
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/trunk:58570,59279-59280,59283,59286,59289-59290,59293,59306-59307,59316,59318-59319
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/trunk:58570,59279-59280,59283,59286,59289-59290,59293,59306-59307,59316,59318-59319,59326
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="branches67testsphpunitincludesbootstrapphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.7/tests/phpunit/includes/bootstrap.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.7/tests/phpunit/includes/bootstrap.php 2024-10-30 23:27:08 UTC (rev 59326)
+++ branches/6.7/tests/phpunit/includes/bootstrap.php 2024-10-30 23:45:53 UTC (rev 59327)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -216,12 +216,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> define( 'DIR_TESTROOT', realpath( dirname( __DIR__ ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> define( 'IMPORTER_PLUGIN_FOR_TESTS', DIR_TESTDATA . '/plugins/wordpress-importer/wordpress-importer.php' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( defined( 'WP_RUN_CORE_TESTS' ) && WP_RUN_CORE_TESTS && ! file_exists( IMPORTER_PLUGIN_FOR_TESTS ) ) {
- echo 'The test suite requires the WordPress Importer plugin to be available in the `/data/plugins/` directory.'
- . ' See: https://make.wordpress.org/core/handbook/contribute/git/#unit-tests' . PHP_EOL,
- exit( 1 );
-}
-
</del><span class="cx" style="display: block; padding: 0 10px"> define( 'WP_LANG_DIR', realpath( DIR_TESTDATA . '/languages' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( defined( 'WP_RUN_CORE_TESTS' ) && WP_RUN_CORE_TESTS ) {
</span></span></pre></div>
<a id="branches67testsphpunittestsimportbasephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.7/tests/phpunit/tests/import/base.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.7/tests/phpunit/tests/import/base.php 2024-10-30 23:27:08 UTC (rev 59326)
+++ branches/6.7/tests/phpunit/tests/import/base.php 2024-10-30 23:45:53 UTC (rev 59327)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,7 +1,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> abstract class WP_Import_UnitTestCase extends WP_UnitTestCase {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Require the WordPress Importer plugin.
+ *
+ * Fails the test if the plugin is not installed.
+ */
+ protected function require_importer() {
+ if ( ! file_exists( IMPORTER_PLUGIN_FOR_TESTS ) ) {
+ $this->fail( 'This test requires the WordPress Importer plugin to be installed in the test suite. See: https://make.wordpress.org/core/handbook/contribute/git/#unit-tests' );
+ }
+ require_once IMPORTER_PLUGIN_FOR_TESTS;
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Import a WXR file.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * The $users parameter provides information on how users specified in the import
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -21,6 +34,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param bool $fetch_files Whether or not do download remote attachments
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> protected function _import_wp( $filename, $users = array(), $fetch_files = true ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->require_importer();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $importer = new WP_Import();
</span><span class="cx" style="display: block; padding: 0 10px"> $file = realpath( $filename );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="branches67testsphpunittestsimportimportphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.7/tests/phpunit/tests/import/import.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.7/tests/phpunit/tests/import/import.php 2024-10-30 23:27:08 UTC (rev 59326)
+++ branches/6.7/tests/phpunit/tests/import/import.php 2024-10-30 23:45:53 UTC (rev 59327)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -21,7 +21,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'import_allow_create_users', '__return_true' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- require_once IMPORTER_PLUGIN_FOR_TESTS;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->require_importer();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Crude but effective: make sure there's no residual data in the main tables.
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( array( 'posts', 'postmeta', 'comments', 'terms', 'term_taxonomy', 'term_relationships', 'users', 'usermeta' ) as $table ) {
</span></span></pre></div>
<a id="branches67testsphpunittestsimportparserphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.7/tests/phpunit/tests/import/parser.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.7/tests/phpunit/tests/import/parser.php 2024-10-30 23:27:08 UTC (rev 59326)
+++ branches/6.7/tests/phpunit/tests/import/parser.php 2024-10-30 23:45:53 UTC (rev 59327)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -17,7 +17,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> define( 'WP_LOAD_IMPORTERS', true );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- require_once IMPORTER_PLUGIN_FOR_TESTS;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->require_importer();
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre></div>
<a id="branches67testsphpunittestsimportpostmetaphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.7/tests/phpunit/tests/import/postmeta.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.7/tests/phpunit/tests/import/postmeta.php 2024-10-30 23:27:08 UTC (rev 59326)
+++ branches/6.7/tests/phpunit/tests/import/postmeta.php 2024-10-30 23:45:53 UTC (rev 59327)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,7 +19,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> define( 'WP_LOAD_IMPORTERS', true );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- require_once IMPORTER_PLUGIN_FOR_TESTS;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->require_importer();
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_serialized_postmeta_no_cdata() {
</span></span></pre>
</div>
</div>
</body>
</html>