From 285bc67318e2ee4b69b13eb0b8e7b202fc287c51 Mon Sep 17 00:00:00 2001 From: Jade Lovelace Date: Wed, 29 May 2024 20:41:22 -0700 Subject: [PATCH] =?UTF-8?q?tests/filetransfer:=20re=C3=ABnable=20on=20Darw?= =?UTF-8?q?in?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- tests/unit/libstore/filetransfer.cc | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/tests/unit/libstore/filetransfer.cc b/tests/unit/libstore/filetransfer.cc index 0e5c0965e..b74d01516 100644 --- a/tests/unit/libstore/filetransfer.cc +++ b/tests/unit/libstore/filetransfer.cc @@ -13,14 +13,6 @@ #include #include -// 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; 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 ft = makeFileTransfer(); @@ -159,7 +151,7 @@ TEST(FileTransfer, NOT_ON_DARWIN(reportsSetupErrors)) FileTransferError); } -TEST(FileTransfer, NOT_ON_DARWIN(reportsTransferError)) +TEST(FileTransfer, reportsTransferError) { auto [port, srv] = serveHTTP("200 ok", "content-length: 100\r\n", [] { std::this_thread::sleep_for(10ms); @@ -171,7 +163,7 @@ TEST(FileTransfer, NOT_ON_DARWIN(reportsTransferError)) ASSERT_THROW(ft->download(req), FileTransferError); } -TEST(FileTransfer, NOT_ON_DARWIN(handlesContentEncoding)) +TEST(FileTransfer, handlesContentEncoding) { std::string original = "Test data string"; std::string compressed = compress("gzip", original);