Merge "Revert "tests/filetransfer: reënable on Darwin"" into main

1 files changed, 11 insertions, 3 deletions

diff --git a/tests/unit/libstore/filetransfer.cc b/tests/unit/libstore/filetransfer.cc
index b74d01516..0e5c0965e 100644
--- a/tests/unit/libstore/filetransfer.cc
+++ b/tests/unit/libstore/filetransfer.cc
@@ -13,6 +13,14 @@
 #include <thread>
 #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;
 
 namespace {
@@ -142,7 +150,7 @@ TEST(FileTransfer, exceptionAbortsDownload)
     }
 }
 
-TEST(FileTransfer, reportsSetupErrors)
+TEST(FileTransfer, NOT_ON_DARWIN(reportsSetupErrors))
 {
     auto [port, srv] = serveHTTP("404 not found", "", [] { return ""; });
     auto ft = makeFileTransfer();
@@ -151,7 +159,7 @@ TEST(FileTransfer, reportsSetupErrors)
         FileTransferError);
 }
 
-TEST(FileTransfer, reportsTransferError)
+TEST(FileTransfer, NOT_ON_DARWIN(reportsTransferError))
 {
     auto [port, srv] = serveHTTP("200 ok", "content-length: 100\r\n", [] {
         std::this_thread::sleep_for(10ms);
@@ -163,7 +171,7 @@ TEST(FileTransfer, reportsTransferError)
     ASSERT_THROW(ft->download(req), FileTransferError);
 }
 
-TEST(FileTransfer, handlesContentEncoding)
+TEST(FileTransfer, NOT_ON_DARWIN(handlesContentEncoding))
 {
     std::string original = "Test data string";
     std::string compressed = compress("gzip", original);