<!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>[57931] trunk/tests/phpunit/tests: Tests: Use an image on WordPress.org CDN in external HTTP 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/57931">57931</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/57931","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>2024-04-05 12:10:13 +0000 (Fri, 05 Apr 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: Use an image on WordPress.org CDN in external HTTP tests.
Due to some changes on the WP.com side to compress the requested images on the fly, the exact image size in the response could be different between platforms.
This commit aims to make the affected tests more reliable.
Follow-up to [139/tests], <a href="https://core.trac.wordpress.org/changeset/31258">[31258]</a>, <a href="https://core.trac.wordpress.org/changeset/34568">[34568]</a>, <a href="https://core.trac.wordpress.org/changeset/47142">[47142]</a>, <a href="https://core.trac.wordpress.org/changeset/57903">[57903]</a>, <a href="https://core.trac.wordpress.org/changeset/57904">[57904]</a>, <a href="https://core.trac.wordpress.org/changeset/57924">[57924]</a>.
Props peterwilsoncc, jorbin.
See <a href="https://core.trac.wordpress.org/ticket/60865">#60865</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestsfunctionswpRemoteFopenphp">trunk/tests/phpunit/tests/functions/wpRemoteFopen.php</a></li>
<li><a href="#trunktestsphpunittestshttpfunctionsphp">trunk/tests/phpunit/tests/http/functions.php</a></li>
<li><a href="#trunktestsphpunittestsimagefunctionsphp">trunk/tests/phpunit/tests/image/functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsphpunittestsfunctionswpRemoteFopenphp"></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/functions/wpRemoteFopen.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/functions/wpRemoteFopen.php 2024-04-04 21:10:39 UTC (rev 57930)
+++ trunk/tests/phpunit/tests/functions/wpRemoteFopen.php 2024-04-05 12:10:13 UTC (rev 57931)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -27,10 +27,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_remote_fopen() {
</span><span class="cx" style="display: block; padding: 0 10px"> // This URL gives a direct 200 response.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $url = 'https://asdftestblog1.wordpress.com/wp-content/uploads/2007/09/2007-06-30-dsc_4700-1.jpg';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $url = 'https://s.w.org/screenshots/3.9/dashboard.png';
</ins><span class="cx" style="display: block; padding: 0 10px"> $response = wp_remote_fopen( $url );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertIsString( $response );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertSame( 40148, strlen( $response ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( 153204, strlen( $response ) );
</ins><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="trunktestsphpunittestshttpfunctionsphp"></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/http/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/http/functions.php 2024-04-04 21:10:39 UTC (rev 57930)
+++ trunk/tests/phpunit/tests/http/functions.php 2024-04-05 12:10:13 UTC (rev 57931)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11,7 +11,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_head_request() {
</span><span class="cx" style="display: block; padding: 0 10px"> // This URL gives a direct 200 response.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $url = 'https://asdftestblog1.wordpress.com/wp-content/uploads/2007/09/2007-06-30-dsc_4700-1.jpg';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $url = 'https://s.w.org/screenshots/3.9/dashboard.png';
</ins><span class="cx" style="display: block; padding: 0 10px"> $response = wp_remote_head( $url );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->skipTestOnTimeout( $response );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -20,8 +20,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertIsArray( $response );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertSame( 'image/jpeg', $headers['Content-Type'] );
- $this->assertSame( '40148', $headers['Content-Length'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( 'image/png', $headers['Content-Type'] );
+ $this->assertSame( '153204', $headers['Content-Length'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 200, wp_remote_retrieve_response_code( $response ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -30,7 +30,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_head_redirect() {
</span><span class="cx" style="display: block; padding: 0 10px"> // This URL will 301 redirect.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $url = 'https://asdftestblog1.wordpress.com/files/2007/09/2007-06-30-dsc_4700-1.jpg';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $url = 'https://wp.org/screenshots/3.9/dashboard.png';
</ins><span class="cx" style="display: block; padding: 0 10px"> $response = wp_remote_head( $url );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->skipTestOnTimeout( $response );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -41,7 +41,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::wp_remote_head
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_head_404() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $url = 'https://asdftestblog1.wordpress.com/wp-content/uploads/2007/09/awefasdfawef.jpg';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $url = 'https://wordpress.org/screenshots/3.9/awefasdfawef.jpg';
</ins><span class="cx" style="display: block; padding: 0 10px"> $response = wp_remote_head( $url );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->skipTestOnTimeout( $response );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -54,7 +54,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::wp_remote_retrieve_response_code
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_request() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $url = 'https://asdftestblog1.wordpress.com/wp-content/uploads/2007/09/2007-06-30-dsc_4700-1.jpg';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $url = 'https://s.w.org/screenshots/3.9/dashboard.png';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $response = wp_remote_get( $url );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -65,8 +65,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertIsArray( $response );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Should return the same headers as a HEAD request.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertSame( 'image/jpeg', $headers['Content-Type'] );
- $this->assertSame( '40148', $headers['Content-Length'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( 'image/png', $headers['Content-Type'] );
+ $this->assertSame( '153204', $headers['Content-Length'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 200, wp_remote_retrieve_response_code( $response ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -76,8 +76,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::wp_remote_retrieve_response_code
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_redirect() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // This will redirect to asdftestblog1.files.wordpress.com.
- $url = 'https://asdftestblog1.wordpress.com/files/2007/09/2007-06-30-dsc_4700-1.jpg';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // This will redirect to wordpress.org.
+ $url = 'https://wp.org/screenshots/3.9/dashboard.png';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $response = wp_remote_get( $url );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -86,8 +86,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $headers = wp_remote_retrieve_headers( $response );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Should return the same headers as a HEAD request.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertSame( 'image/jpeg', $headers['Content-Type'] );
- $this->assertSame( '40148', $headers['Content-Length'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( 'image/png', $headers['Content-Type'] );
+ $this->assertSame( '153204', $headers['Content-Length'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 200, wp_remote_retrieve_response_code( $response ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -95,8 +95,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::wp_remote_get
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_get_redirect_limit_exceeded() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // This will redirect to asdftestblog1.files.wordpress.com.
- $url = 'https://asdftestblog1.wordpress.com/files/2007/09/2007-06-30-dsc_4700-1.jpg';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // This will redirect to wordpress.org.
+ $url = 'https://wp.org/screenshots/3.9/dashboard.png';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Pretend we've already redirected 5 times.
</span><span class="cx" style="display: block; padding: 0 10px"> $response = wp_remote_get( $url, array( 'redirection' => -1 ) );
</span></span></pre></div>
<a id="trunktestsphpunittestsimagefunctionsphp"></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/image/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/image/functions.php 2024-04-04 21:10:39 UTC (rev 57930)
+++ trunk/tests/phpunit/tests/image/functions.php 2024-04-05 12:10:13 UTC (rev 57931)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -638,7 +638,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_crop_image_with_url() {
</span><span class="cx" style="display: block; padding: 0 10px"> $file = wp_crop_image(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'https://asdftestblog1.wordpress.com/wp-content/uploads/2008/04/canola.jpg',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'https://s.w.org/screenshots/3.9/dashboard.png',
</ins><span class="cx" style="display: block; padding: 0 10px"> 0,
</span><span class="cx" style="display: block; padding: 0 10px"> 0,
</span><span class="cx" style="display: block; padding: 0 10px"> 100,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -646,7 +646,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 100,
</span><span class="cx" style="display: block; padding: 0 10px"> 100,
</span><span class="cx" style="display: block; padding: 0 10px"> false,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- DIR_TESTDATA . '/images/' . __FUNCTION__ . '.jpg'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ DIR_TESTDATA . '/images/' . __FUNCTION__ . '.png'
</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"> if ( is_wp_error( $file ) && $file->get_error_code() === 'invalid_image' ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -687,7 +687,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_crop_image_should_fail_with_wp_error_object_if_url_does_not_exist() {
</span><span class="cx" style="display: block; padding: 0 10px"> $file = wp_crop_image(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'https://asdftestblog1.wordpress.com/wp-content/uploads/2008/04/canoladoesnotexist.jpg',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'https://wordpress.org/screenshots/3.9/canoladoesnotexist.jpg',
</ins><span class="cx" style="display: block; padding: 0 10px"> 0,
</span><span class="cx" style="display: block; padding: 0 10px"> 0,
</span><span class="cx" style="display: block; padding: 0 10px"> 100,
</span></span></pre>
</div>
</div>
</body>
</html>