<!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>[51869] trunk/tests/phpunit/tests: Tests: Remove unnecessary `setUp()` and `tearDown()` methods in multisite tests.</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/51869">51869</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/51869","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2021-09-25 01:27:47 +0000 (Sat, 25 Sep 2021)</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: Remove unnecessary `setUp()` and `tearDown()` methods in multisite tests.
These were originally added in <a href="https://core.trac.wordpress.org/changeset/26252">[26252]</a> to suppress database errors on `setUp()` and restore on `tearDown()` for tests that call `wpmu_create_blog()`, blog factory, or installation code that attempts to clear transients.
As the multisite test coverage expanded, these methods ended up being unnecessarily copied into other test classes, where database error suppression is not required.
Follow-up to <a href="https://core.trac.wordpress.org/changeset/26252">[26252]</a>, <a href="https://core.trac.wordpress.org/changeset/29916">[29916]</a>, <a href="https://core.trac.wordpress.org/changeset/30286">[30286]</a>, <a href="https://core.trac.wordpress.org/changeset/33184">[33184]</a>, <a href="https://core.trac.wordpress.org/changeset/34898">[34898]</a>, <a href="https://core.trac.wordpress.org/changeset/34899">[34899]</a>, <a href="https://core.trac.wordpress.org/changeset/34901">[34901]</a>, <a href="https://core.trac.wordpress.org/changeset/37234">[37234]</a>, <a href="https://core.trac.wordpress.org/changeset/37477">[37477]</a>, <a href="https://core.trac.wordpress.org/changeset/37894">[37894]</a>, <a href="https://core.trac.wordpress.org/changeset/49212">[49212]</a>, <a href="https://core.trac.wordpress.org/changeset/49616">[49616]</a>, <a href="https://core.trac.wordpress.org/changeset/51859">[51859]</a>.
See <a href="https://core.trac.wordpress.org/ticket/53363">#53363</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestsmultisitecleanDirsizeCachephp">trunk/tests/phpunit/tests/multisite/cleanDirsizeCache.php</a></li>
<li><a href="#trunktestsphpunittestsmultisitegetSpaceAllowedphp">trunk/tests/phpunit/tests/multisite/getSpaceAllowed.php</a></li>
<li><a href="#trunktestsphpunittestsmultisitegetSpaceUsedphp">trunk/tests/phpunit/tests/multisite/getSpaceUsed.php</a></li>
<li><a href="#trunktestsphpunittestsmultisiteisUploadSpaceAvailablephp">trunk/tests/phpunit/tests/multisite/isUploadSpaceAvailable.php</a></li>
<li><a href="#trunktestsphpunittestsmultisitemsFilesRewritingphp">trunk/tests/phpunit/tests/multisite/msFilesRewriting.php</a></li>
<li><a href="#trunktestsphpunittestsmultisitenetworkphp">trunk/tests/phpunit/tests/multisite/network.php</a></li>
<li><a href="#trunktestsphpunittestsmultisiteuploadIsUserOverQuotaphp">trunk/tests/phpunit/tests/multisite/uploadIsUserOverQuota.php</a></li>
<li><a href="#trunktestsphpunittestsmultisitewpNetworkQueryphp">trunk/tests/phpunit/tests/multisite/wpNetworkQuery.php</a></li>
<li><a href="#trunktestsphpunittestsmultisitewpSiteQueryphp">trunk/tests/phpunit/tests/multisite/wpSiteQuery.php</a></li>
<li><a href="#trunktestsphpunittestsmultisitephp">trunk/tests/phpunit/tests/multisite.php</a></li>
<li><a href="#trunktestsphpunittestsoptionmultisitephp">trunk/tests/phpunit/tests/option/multisite.php</a></li>
<li><a href="#trunktestsphpunittestsusermultisitephp">trunk/tests/phpunit/tests/user/multisite.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsphpunittestsmultisitecleanDirsizeCachephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/multisite/cleanDirsizeCache.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/multisite/cleanDirsizeCache.php 2021-09-24 16:54:42 UTC (rev 51868)
+++ trunk/tests/phpunit/tests/multisite/cleanDirsizeCache.php 2021-09-25 01:27:47 UTC (rev 51869)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -9,20 +9,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group multisite
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Multisite_CleanDirsizeCache extends WP_UnitTestCase {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- protected $suppress = false;
</del><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function set_up() {
- global $wpdb;
- parent::set_up();
- $this->suppress = $wpdb->suppress_errors();
- }
-
- function tear_down() {
- global $wpdb;
- $wpdb->suppress_errors( $this->suppress );
- parent::tear_down();
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Test whether dirsize_cache values are used correctly with a more complex dirsize cache mock.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span></span></pre></div>
<a id="trunktestsphpunittestsmultisitegetSpaceAllowedphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/multisite/getSpaceAllowed.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/multisite/getSpaceAllowed.php 2021-09-24 16:54:42 UTC (rev 51868)
+++ trunk/tests/phpunit/tests/multisite/getSpaceAllowed.php 2021-09-25 01:27:47 UTC (rev 51869)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,21 +8,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group multisite
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Multisite_GetSpaceAllowed extends WP_UnitTestCase {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- protected $suppress = false;
</del><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function set_up() {
- global $wpdb;
- parent::set_up();
- $this->suppress = $wpdb->suppress_errors();
- }
-
- public function tear_down() {
- global $wpdb;
-
- $wpdb->suppress_errors( $this->suppress );
- parent::tear_down();
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * When no option exists for the site or the network, a fallback of
</span><span class="cx" style="display: block; padding: 0 10px"> * 100 is expected.
</span></span></pre></div>
<a id="trunktestsphpunittestsmultisitegetSpaceUsedphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/multisite/getSpaceUsed.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/multisite/getSpaceUsed.php 2021-09-24 16:54:42 UTC (rev 51868)
+++ trunk/tests/phpunit/tests/multisite/getSpaceUsed.php 2021-09-25 01:27:47 UTC (rev 51869)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7,20 +7,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::get_space_used
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Multisite_GetSpaceUsed extends WP_UnitTestCase {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- protected $suppress = false;
</del><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function set_up() {
- global $wpdb;
- parent::set_up();
- $this->suppress = $wpdb->suppress_errors();
- }
-
- function tear_down() {
- global $wpdb;
- $wpdb->suppress_errors( $this->suppress );
- parent::tear_down();
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> function test_get_space_used_switched_site() {
</span><span class="cx" style="display: block; padding: 0 10px"> $blog_id = self::factory()->blog->create();
</span><span class="cx" style="display: block; padding: 0 10px"> switch_to_blog( $blog_id );
</span></span></pre></div>
<a id="trunktestsphpunittestsmultisiteisUploadSpaceAvailablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/multisite/isUploadSpaceAvailable.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/multisite/isUploadSpaceAvailable.php 2021-09-24 16:54:42 UTC (rev 51868)
+++ trunk/tests/phpunit/tests/multisite/isUploadSpaceAvailable.php 2021-09-25 01:27:47 UTC (rev 51869)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11,23 +11,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group multisite
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Multisite_IsUploadSpaceAvailable extends WP_UnitTestCase {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- protected $suppress = false;
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function set_up() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wpdb;
</del><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->suppress = $wpdb->suppress_errors();
-
</del><span class="cx" style="display: block; padding: 0 10px"> update_site_option( 'upload_space_check_disabled', false );
</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">- public function tear_down() {
- global $wpdb;
-
- $wpdb->suppress_errors( $this->suppress );
- parent::tear_down();
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * A default of 100MB is used when no `blog_upload_space` option
</span><span class="cx" style="display: block; padding: 0 10px"> * exists at the site or network level.
</span></span></pre></div>
<a id="trunktestsphpunittestsmultisitemsFilesRewritingphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/multisite/msFilesRewriting.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/multisite/msFilesRewriting.php 2021-09-24 16:54:42 UTC (rev 51868)
+++ trunk/tests/phpunit/tests/multisite/msFilesRewriting.php 2021-09-25 01:27:47 UTC (rev 51869)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,25 +12,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group multisite
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Multisite_msFilesRewriting extends WP_UnitTestCase {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- protected $suppress = false;
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function set_up() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wpdb;
</del><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->suppress = $wpdb->suppress_errors();
-
</del><span class="cx" style="display: block; padding: 0 10px"> update_site_option( 'ms_files_rewriting', 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> ms_upload_constants();
</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">- function tear_down() {
- global $wpdb;
-
- $wpdb->suppress_errors( $this->suppress );
-
- parent::tear_down();
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> function test_switch_upload_dir() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( is_main_site() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestsmultisitenetworkphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/multisite/network.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/multisite/network.php 2021-09-24 16:54:42 UTC (rev 51868)
+++ trunk/tests/phpunit/tests/multisite/network.php 2021-09-25 01:27:47 UTC (rev 51869)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,20 +10,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Multisite_Network extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px"> protected $plugin_hook_count = 0;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- protected $suppress = false;
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> protected static $different_network_id;
</span><span class="cx" style="display: block; padding: 0 10px"> protected static $different_site_ids = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function set_up() {
- global $wpdb;
- parent::set_up();
- $this->suppress = $wpdb->suppress_errors();
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> function tear_down() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wpdb, $current_site;
- $wpdb->suppress_errors( $this->suppress );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $current_site;
</ins><span class="cx" style="display: block; padding: 0 10px"> $current_site->id = 1;
</span><span class="cx" style="display: block; padding: 0 10px"> parent::tear_down();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -590,9 +582,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 38699
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wpmu_create_blog_updates_correct_network_site_count() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $wpdb;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $original_count = get_blog_count( self::$different_network_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $site_id = wpmu_create_blog( 'example.org', '/', '', 1, array(), self::$different_network_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $suppress = $wpdb->suppress_errors();
+ $site_id = wpmu_create_blog( 'example.org', '/', '', 1, array(), self::$different_network_id );
+ $wpdb->suppress_errors( $suppress );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = get_blog_count( self::$different_network_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestsmultisiteuploadIsUserOverQuotaphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/multisite/uploadIsUserOverQuota.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/multisite/uploadIsUserOverQuota.php 2021-09-24 16:54:42 UTC (rev 51868)
+++ trunk/tests/phpunit/tests/multisite/uploadIsUserOverQuota.php 2021-09-25 01:27:47 UTC (rev 51869)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11,22 +11,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group multisite
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Multisite_UploadIsUserOverQuota extends WP_UnitTestCase {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- protected $suppress = false;
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function set_up() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wpdb;
</del><span class="cx" style="display: block; padding: 0 10px"> parent::set_up();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->suppress = $wpdb->suppress_errors();
-
</del><span class="cx" style="display: block; padding: 0 10px"> update_site_option( 'upload_space_check_disabled', false );
</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">- public function tear_down() {
- global $wpdb;
- $wpdb->suppress_errors( $this->suppress );
- parent::tear_down();
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> public function test_upload_is_user_over_quota_allowed_0_used_5() {
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'get_space_allowed', '__return_zero' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'pre_get_space_used', array( $this, '_filter_space_5' ) );
</span></span></pre></div>
<a id="trunktestsphpunittestsmultisitewpNetworkQueryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/multisite/wpNetworkQuery.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/multisite/wpNetworkQuery.php 2021-09-24 16:54:42 UTC (rev 51868)
+++ trunk/tests/phpunit/tests/multisite/wpNetworkQuery.php 2021-09-25 01:27:47 UTC (rev 51869)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,20 +12,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Multisite_wpNetworkQuery extends WP_UnitTestCase {
</span><span class="cx" style="display: block; padding: 0 10px"> protected static $network_ids;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- protected $suppress = false;
-
- function set_up() {
- global $wpdb;
- parent::set_up();
- $this->suppress = $wpdb->suppress_errors();
- }
-
- function tear_down() {
- global $wpdb;
- $wpdb->suppress_errors( $this->suppress );
- parent::tear_down();
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
</span><span class="cx" style="display: block; padding: 0 10px"> self::$network_ids = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'wordpress.org/' => array(
</span></span></pre></div>
<a id="trunktestsphpunittestsmultisitewpSiteQueryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/multisite/wpSiteQuery.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/multisite/wpSiteQuery.php 2021-09-24 16:54:42 UTC (rev 51868)
+++ trunk/tests/phpunit/tests/multisite/wpSiteQuery.php 2021-09-25 01:27:47 UTC (rev 51869)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,20 +12,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> protected static $network_ids;
</span><span class="cx" style="display: block; padding: 0 10px"> protected static $site_ids;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- protected $suppress = false;
-
- function set_up() {
- global $wpdb;
- parent::set_up();
- $this->suppress = $wpdb->suppress_errors();
- }
-
- function tear_down() {
- global $wpdb;
- $wpdb->suppress_errors( $this->suppress );
- parent::tear_down();
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
</span><span class="cx" style="display: block; padding: 0 10px"> self::$network_ids = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'wordpress.org/' => array(
</span></span></pre></div>
<a id="trunktestsphpunittestsmultisitephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/multisite.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/multisite.php 2021-09-24 16:54:42 UTC (rev 51868)
+++ trunk/tests/phpunit/tests/multisite.php 2021-09-25 01:27:47 UTC (rev 51869)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,20 +8,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group multisite
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Multisite extends WP_UnitTestCase {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- protected $suppress = false;
</del><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function set_up() {
- global $wpdb;
- parent::set_up();
- $this->suppress = $wpdb->suppress_errors();
- }
-
- function tear_down() {
- global $wpdb;
- $wpdb->suppress_errors( $this->suppress );
- parent::tear_down();
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> function test_wpmu_log_new_registrations() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestsoptionmultisitephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/option/multisite.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/option/multisite.php 2021-09-24 16:54:42 UTC (rev 51868)
+++ trunk/tests/phpunit/tests/option/multisite.php 2021-09-25 01:27:47 UTC (rev 51869)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,20 +10,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group multisite
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Multisite_Option extends WP_UnitTestCase {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- protected $suppress = false;
</del><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function set_up() {
- global $wpdb;
- parent::set_up();
- $this->suppress = $wpdb->suppress_errors();
- }
-
- function tear_down() {
- global $wpdb;
- $wpdb->suppress_errors( $this->suppress );
- parent::tear_down();
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> function test_from_same_site() {
</span><span class="cx" style="display: block; padding: 0 10px"> $key = __FUNCTION__ . '_1';
</span><span class="cx" style="display: block; padding: 0 10px"> $key2 = __FUNCTION__ . '_2';
</span></span></pre></div>
<a id="trunktestsphpunittestsusermultisitephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/user/multisite.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/user/multisite.php 2021-09-24 16:54:42 UTC (rev 51868)
+++ trunk/tests/phpunit/tests/user/multisite.php 2021-09-25 01:27:47 UTC (rev 51869)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,20 +10,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @group multisite
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class Tests_Multisite_User extends WP_UnitTestCase {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- protected $suppress = false;
</del><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function set_up() {
- global $wpdb;
- parent::set_up();
- $this->suppress = $wpdb->suppress_errors();
- }
-
- function tear_down() {
- global $wpdb;
- $wpdb->suppress_errors( $this->suppress );
- parent::tear_down();
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> function test_remove_user_from_blog() {
</span><span class="cx" style="display: block; padding: 0 10px"> $user1 = self::factory()->user->create_and_get();
</span><span class="cx" style="display: block; padding: 0 10px"> $user2 = self::factory()->user->create_and_get();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -395,9 +382,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 38356
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_add_user_to_blog_invalid_user() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $wpdb;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $site_id = self::factory()->blog->create();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $result = add_user_to_blog( 73622, $site_id, 'subscriber' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $suppress = $wpdb->suppress_errors();
+ $result = add_user_to_blog( 73622, $site_id, 'subscriber' );
+ $wpdb->suppress_errors( $suppress );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_delete_site( $site_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>