Fix expected output comparison with newer versions of libcurl

Author: vicroms

azure-pipelines/end-to-end-tests-dir/asset-caching.ps1

@@ -59,7 +59,7 @@ Throw-IfNotFailed
 $expected = @(
 "A suitable version of cmake was not found \(required v[0-9.]+\)\.",
 "Trying to download cmake-[0-9.]+-[^.]+\.(zip|tar\.gz) using asset cache file://$assetCacheRegex/[0-9a-z]+",
-"error: curl operation failed with error code 37 \(Couldn't read a file:\/\/ file\)\.",
+"error: curl operation failed with error code 37 \((Couldn't|Could not) read a file:\/\/ file\)\.",
 "error: Not a transient network error, won't retry download from file://$assetCacheRegex/[0-9a-z]+"
 "error: there were no asset cache hits, and x-block-origin blocks trying the authoritative source https://github\.com/Kitware/CMake/releases/download/[^ ]+",
 "note: If you are using a proxy, please ensure your proxy settings are correct\.",
@@ -112,7 +112,7 @@ if (-not ($actual -match $expected)) {
 Refresh-TestRoot
 $expected = @(
 "^Downloading https://localhost:1234/foobar\.html -> example3\.html",
-"error: curl operation failed with error code 7 \(Couldn't connect to server\)\.",
+"error: curl operation failed with error code 7 \((Couldn't|Could not) connect to server\)\.",
 "error: Not a transient network error, won't retry download from https://localhost:1234/foobar\.html",
 "note: If you are using a proxy, please ensure your proxy settings are correct\.",
 "Possible causes are:",
@@ -136,10 +136,10 @@ if (-not ($actual -match $expected)) {
 Refresh-TestRoot
 $expected = @(
 "^Downloading example3\.html, trying https://localhost:1234/foobar\.html",
-"error: curl operation failed with error code 7 \(Couldn't connect to server\)\.",
+"error: curl operation failed with error code 7 \((Couldn't|Could not) connect to server\)\.",
 "error: Not a transient network error, won't retry download from https://localhost:1234/foobar\.html",
 "Trying https://localhost:1235/baz\.html",
-"error: curl operation failed with error code 7 \(Couldn't connect to server\)\.",
+"error: curl operation failed with error code 7 \((Couldn't|Could not) connect to server\)\.",
 "error: Not a transient network error, won't retry download from https://localhost:1235/baz\.html",
 "note: If you are using a proxy, please ensure your proxy settings are correct\.",
 "Possible causes are:",
@@ -195,7 +195,7 @@ if (-not ($actual -match $expected)) {
 Refresh-TestRoot
 $expected = @(
 "^Downloading example3\.html, trying https://nonexistent\.example\.com",
-"error: curl operation failed with error code 6 \(Couldn't resolve host name\)\.",
+"error: curl operation failed with error code 6 \((Couldn't|Could not) resolve host name\)\.",
 "error: Not a transient network error, won't retry download from https://nonexistent\.example\.com",
 "Trying https://raw\.githubusercontent\.com/microsoft/vcpkg-tool/1767aaee7b229c609f7ad5cf2f57b6a6cc309fb8/LICENSE\.txt"
 "Successfully downloaded example3\.html",
@@ -229,9 +229,9 @@ Refresh-TestRoot
 $expected = @(
 "^Trying to download example3\.html using asset cache file://$assetCacheRegex/[0-9a-z]+",
 "Asset cache miss; trying authoritative source https://localhost:1234/foobar\.html",
-"error: curl operation failed with error code 37 \(Couldn't read a file:// file\)\.",
+"error: curl operation failed with error code 37 \((Couldn't|Could not) read a file:// file\)\.",
 "error: Not a transient network error, won't retry download from file://$assetCacheRegex/[0-9a-z]+",
-"error: curl operation failed with error code 7 \(Couldn't connect to server\)\.",
+"error: curl operation failed with error code 7 \((Couldn't|Could not) connect to server\)\.",
 "error: Not a transient network error, won't retry download from https://localhost:1234/foobar\.html",
 "note: If you are using a proxy, please ensure your proxy settings are correct\.",
 "Possible causes are:",
@@ -291,7 +291,7 @@ if (-not ($actual -match $expected)) {
 $expected = @(
 "^Trying to download example3\.html using asset cache file://$assetCacheRegex/[0-9a-z]+",
 "Asset cache miss; trying authoritative source https://raw\.githubusercontent\.com/microsoft/vcpkg-tool/1767aaee7b229c609f7ad5cf2f57b6a6cc309fb8/LICENSE\.txt",
-"error: curl operation failed with error code 37 \(Couldn't read a file:// file\)\.",
+"error: curl operation failed with error code 37 \((Couldn't|Could not) read a file:// file\)\.",
 "error: Not a transient network error, won't retry download from file://$assetCacheRegex/[0-9a-z]+",
 "[^\n]+example3\.html\.\d+\.part: error: download from https://raw\.githubusercontent\.com/microsoft/vcpkg-tool/1767aaee7b229c609f7ad5cf2f57b6a6cc309fb8/LICENSE\.txt had an unexpected hash",
 "note: Expected: d06b93c883f8126a04589937a884032df031b05518eed9d433efb6447834df2596aebd500d69b8283e5702d988ed49655ae654c1683c7a4ae58bfa6b92f2b73b",
@@ -354,7 +354,7 @@ if (-not ($actual -match $expected)) {
 Refresh-TestRoot
 $expected = @(
 "^Trying to download example3\.html using asset cache file://$assetCacheRegex/[0-9a-z]+",
-"error: curl operation failed with error code 37 \(Couldn't read a file:// file\)\.",
+"error: curl operation failed with error code 37 \((Couldn't|Could not) read a file:// file\)\.",
 "error: Not a transient network error, won't retry download from file://$assetCacheRegex/[0-9a-z]+",
 "error: there were no asset cache hits, and x-block-origin blocks trying the authoritative source https://raw\.githubusercontent\.com/microsoft/vcpkg-tool/1767aaee7b229c609f7ad5cf2f57b6a6cc309fb8/LICENSE\.txt",
 "note: or https://alternate\.example\.com",

src/vcpkg-test/downloads.cpp

@@ -134,9 +134,11 @@ TEST_CASE ("download_files", "[downloads]")
     std::vector<std::string> headers;
     auto results = download_files_no_cache(bdc, test_downloads, headers);
     REQUIRE(results == std::vector<int>{-1, -1});
-    auto all_errors = bdc.to_string();
-    REQUIRE(all_errors == "error: curl operation failed with error code 1 (Unsupported protocol).\n"
-                          "error: curl operation failed with error code 7 (Couldn't connect to server).");
+    auto all_errors = Strings::split(bdc.to_string(), '\n');
+    REQUIRE(all_errors[0] == "error: curl operation failed with error code 1 (Unsupported protocol).");
+    // Old versions of libcurl use "Couldn't" on error messages
+    REQUIRE((all_errors[1] == "error: curl operation failed with error code 7 (Could not connect to server)." ||
+             all_errors[1] == "error: curl operation failed with error code 7 (Couldn't connect to server)."));
 }
 
 TEST_CASE ("try_parse_curl_max5_size", "[downloads]")