guiwf/lix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "libstore: don't use curl decompression support"" into main

Browse Source
This commit is contained in:
jade
2025-04-09 16:01:37 +00:00
committed by Lix Systems Gerrit
parent fb0ef6ca6b 350bf7e42d
commit 9c2dba4ee2
3 changed files with 20 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/unit/libstore/filetransfer.cc
+3 -29
View File
@@ -26,7 +26,6 @@
#endif
using namespace std::chrono_literals;
using namespace std::string_literals;
namespace {
@@ -259,16 +258,12 @@ TEST(FileTransfer, NOT_ON_DARWIN(defersFailures))
ASSERT_THROW(src->drain(), FileTransferError);
}
class FileTransferEncoding : public testing::TestWithParam<std::pair<std::string, std::string>>
{};
TEST_P(FileTransferEncoding, NOT_ON_DARWIN(handlesContentEncoding))
TEST(FileTransfer, NOT_ON_DARWIN(handlesContentEncoding))
{
std::string original = "Test data string";
auto [method, compressed] = GetParam();
std::string compressed = compress("gzip", original);
auto [port, srv] =
serveHTTP("200 ok", "content-encoding: " + method + "\r\n", [&] { return compressed; });
auto [port, srv] = serveHTTP("200 ok", "content-encoding: gzip\r\n", [&] { return compressed; });
auto ft = makeFileTransfer();
StringSink sink;
@@ -276,27 +271,6 @@ TEST_P(FileTransferEncoding, NOT_ON_DARWIN(handlesContentEncoding))
EXPECT_EQ(sink.s, original);
}
INSTANTIATE_TEST_SUITE_P(
,
FileTransferEncoding,
testing::Values(
std::pair{
"gzip",
"\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\x03\x0b\x49\x2d\x2e\x51\x48\x49\x2c\x49\x54\x28"
"\x2e\x29\xca\xcc\x4b\x07\x00\x34\xfd\xff\xfa\x10\x00\x00\x00"s
},
std::pair{
"zstd",
"\x28\xb5\x2f\xfd\x04\x58\x81\x00\x00\x54\x65\x73\x74\x20\x64\x61\x74\x61\x20\x73\x74"
"\x72\x69\x6e\x67\x5e\xc9\x0e\xca"s
},
std::pair{
"br",
"\x8f\x07\x80\x54\x65\x73\x74\x20\x64\x61\x74\x61\x20\x73\x74\x72\x69\x6e\x67\x03"s
}
)
);
TEST(FileTransfer, usesIntermediateLinkHeaders)
{
auto [port, srv] = serveHTTP({