[pecl-search_engine-solr] master: Change test outputs because of curl changes
| From: | Birgir Haraldsson | Date: | Tue, 12 May 2026 08:41:16 +0000 |
| Subject: | [pecl-search_engine-solr] master: Change test outputs because of curl changes | ||
| Groups: | php.pecl.cvs | ||
| Request: | Send a blank email to pecl-cvs+get-28554@lists.php.net to get a copy of this message | ||
Author: Birgir Haraldsson (bix0r)
Date: 2026-05-12T10:09:09+02:00
Commit: https://github.com/php/pecl-search_engine-solr/commit/c6fc3eae733781927c43ca1375ce9eda9174ce32
Raw diff: https://github.com/php/pecl-search_engine-solr/commit/c6fc3eae733781927c43ca1375ce9eda9174ce32.diff
Change test outputs because of curl changes
When testing compilation on newer curl, some changes were needed to our tests.
In version 8.9.0 of curl, some error messages have changed.
Two extra headers are now also set (not sure what version).
Current version of curl for ubuntu:latest (24.04) is 8.5,
26.04 comes with 8.18.
Debian 13 ships with 8.14.
Changed paths:
M tests/003.solrclient_options.phpt
M tests/019.solrclient_getdebug.phpt
Diff:
diff --git a/tests/003.solrclient_options.phpt b/tests/003.solrclient_options.phpt
index 24e48051..2f4e8d4d 100644
--- a/tests/003.solrclient_options.phpt
+++ b/tests/003.solrclient_options.phpt
@@ -112,8 +112,8 @@ HTTP/1.1 200 OK
Content-Type: application/xml; charset=UTF-8
Content-Length: 0
-SolrClientException 1004: Solr HTTP Error 7: 'Couldn't connect to server'
-SolrClientException 1004: Solr HTTP Error 7: 'Couldn't connect to server'
+SolrClientException 1004: Solr HTTP Error 7: 'Could%s connect to server'
+SolrClientException 1004: Solr HTTP Error 7: 'Could%s connect to server'
SolrIllegalArgumentException 4000: The SolrClient options cannot be an empty array
diff --git a/tests/019.solrclient_getdebug.phpt b/tests/019.solrclient_getdebug.phpt
index ff4b66d6..a22eedd5 100644
--- a/tests/019.solrclient_getdebug.phpt
+++ b/tests/019.solrclient_getdebug.phpt
@@ -34,6 +34,8 @@ foreach ( $lines as $line) {
0 === strpos($line, 'TCP_NODELAY') ||
0 === strpos($line, 'Accept-Encoding') ||
0 === strpos($line, 'Curl_http_done') ||
+ 0 === strpos($line, 'Request completely sent off') ||
+ 0 === strpos($line, 'using HTTP/1.x') ||
0 === strpos($line, 'processing:')
) {
$print = false;