lix-project/lix
20
57
Fork 31
Code Issues 347 Code Review (Gerrit) Projects 3 Releases Wiki Activity

tests/filetransfer: reënable on Darwin

Browse source 
Since we put __darwinAllowLocalNetworking in our derivation in
I752b81c85ebeaab4e582ac01c239d69d65580f37, this stuff will just work
fine. I checked our derivation works on the darwin community builder.

Change-Id: I40e3a801d6bb38efede79af4aded65c1e1f57cec
This commit is contained in:
jade 2024-05-29 20:41:22 -07:00
parent 562ff516ab
commit 285bc67318
1 changed files with 3 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
tests/unit/libstore/filetransfer.cc
View file

@ -13,14 +13,6 @@
#include <thread> #include <thread>
#include <unistd.h> #include <unistd.h>
// local server tests don't work on darwin without some incantations
// the horrors do not want to look up. contributions welcome though!
#if __APPLE__
#define NOT_ON_DARWIN(n) DISABLED_##n
#else
#define NOT_ON_DARWIN(n) n
#endif
using namespace std::chrono_literals; using namespace std::chrono_literals;
namespace { namespace {
@ -150,7 +142,7 @@ TEST(FileTransfer, exceptionAbortsDownload)
} }
} }
TEST(FileTransfer, NOT_ON_DARWIN(reportsSetupErrors)) TEST(FileTransfer, reportsSetupErrors)
{ {
auto [port, srv] = serveHTTP("404 not found", "", [] { return ""; }); auto [port, srv] = serveHTTP("404 not found", "", [] { return ""; });
auto ft = makeFileTransfer(); auto ft = makeFileTransfer();
@ -159,7 +151,7 @@ TEST(FileTransfer, NOT_ON_DARWIN(reportsSetupErrors))
FileTransferError); FileTransferError);
} }
TEST(FileTransfer, NOT_ON_DARWIN(reportsTransferError)) TEST(FileTransfer, reportsTransferError)
{ {
auto [port, srv] = serveHTTP("200 ok", "content-length: 100\r\n", [] { auto [port, srv] = serveHTTP("200 ok", "content-length: 100\r\n", [] {
std::this_thread::sleep_for(10ms); std::this_thread::sleep_for(10ms);
@ -171,7 +163,7 @@ TEST(FileTransfer, NOT_ON_DARWIN(reportsTransferError))
ASSERT_THROW(ft->download(req), FileTransferError); ASSERT_THROW(ft->download(req), FileTransferError);
} }
TEST(FileTransfer, NOT_ON_DARWIN(handlesContentEncoding)) TEST(FileTransfer, handlesContentEncoding)
{ {
std::string original = "Test data string"; std::string original = "Test data string";
std::string compressed = compress("gzip", original); std::string compressed = compress("gzip", original);