From 14bec588758712d7cc1c951bb0567a7b6d0e3589 Mon Sep 17 00:00:00 2001 From: Phillip Cloud <417981+cpcloud@users.noreply.github.com> Date: Fri, 5 Nov 2021 17:25:58 -0400 Subject: [PATCH 1/2] arrow-cpp: disable some potentially failing s3fs tests --- .../libraries/arrow-cpp/default.nix | 32 +++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix index fbf84f34ca5c..2edfdc43f3f4 100644 --- a/pkgs/development/libraries/arrow-cpp/default.nix +++ b/pkgs/development/libraries/arrow-cpp/default.nix @@ -171,11 +171,39 @@ stdenv.mkDerivation rec { "TestFilterKernelWithNumeric/7.CompareArrayAndFilterRandomNumeric" "TestCompareKernel.PrimitiveRandomTests" ] ++ lib.optionals enableS3 [ + "S3OptionsTest.FromUri" + "S3RegionResolutionTest.NonExistentBucket" "S3RegionResolutionTest.PublicBucket" "S3RegionResolutionTest.RestrictedBucket" - "S3RegionResolutionTest.NonExistentBucket" - "S3OptionsTest.FromUri" "TestMinioServer.Connect" + "TestS3FS.OpenOutputStreamBackgroundWrites" + "TestS3FS.OpenOutputStreamDestructorBackgroundWrites" + "TestS3FS.OpenOutputStreamDestructorSyncWrite" + "TestS3FS.OpenOutputStreamDestructorSyncWrites" + "TestS3FS.OpenOutputStreamMetadata" + "TestS3FS.OpenOutputStreamSyncWrites" + "TestS3FSGeneric.CopyFile" + "TestS3FSGeneric.CreateDir" + "TestS3FSGeneric.DeleteDir" + "TestS3FSGeneric.DeleteDirContents" + "TestS3FSGeneric.DeleteFile" + "TestS3FSGeneric.DeleteFiles" + "TestS3FSGeneric.DeleteRootDirContents" + "TestS3FSGeneric.GetFileInfo" + "TestS3FSGeneric.GetFileInfoAsync" + "TestS3FSGeneric.GetFileInfoGenerator" + "TestS3FSGeneric.GetFileInfoSelector" + "TestS3FSGeneric.GetFileInfoSelectorWithRecursion" + "TestS3FSGeneric.GetFileInfoVector" + "TestS3FSGeneric.MoveFile" + "TestS3FSGeneric.OpenInputFile" + "TestS3FSGeneric.OpenInputFileAsync" + "TestS3FSGeneric.OpenInputFileWithFileInfo" + "TestS3FSGeneric.OpenInputStream" + "TestS3FSGeneric.OpenInputStreamAsync" + "TestS3FSGeneric.OpenInputStreamWithFileInfo" + "TestS3FSGeneric.OpenOutputStream" + "TestS3FSGeneric.SpecialChars" ]; in lib.optionalString doInstallCheck "-${builtins.concatStringsSep ":" filteredTests}"; From ab269d980ef8ceee260de027c3e28b7eda421daa Mon Sep 17 00:00:00 2001 From: Phillip Cloud <417981+cpcloud@users.noreply.github.com> Date: Sat, 6 Nov 2021 07:03:13 -0400 Subject: [PATCH 2/2] arrow-cpp: glob TestS3FSGeneric tests --- .../libraries/arrow-cpp/default.nix | 23 +------------------ 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix index 2edfdc43f3f4..1ede4ced5071 100644 --- a/pkgs/development/libraries/arrow-cpp/default.nix +++ b/pkgs/development/libraries/arrow-cpp/default.nix @@ -182,28 +182,7 @@ stdenv.mkDerivation rec { "TestS3FS.OpenOutputStreamDestructorSyncWrites" "TestS3FS.OpenOutputStreamMetadata" "TestS3FS.OpenOutputStreamSyncWrites" - "TestS3FSGeneric.CopyFile" - "TestS3FSGeneric.CreateDir" - "TestS3FSGeneric.DeleteDir" - "TestS3FSGeneric.DeleteDirContents" - "TestS3FSGeneric.DeleteFile" - "TestS3FSGeneric.DeleteFiles" - "TestS3FSGeneric.DeleteRootDirContents" - "TestS3FSGeneric.GetFileInfo" - "TestS3FSGeneric.GetFileInfoAsync" - "TestS3FSGeneric.GetFileInfoGenerator" - "TestS3FSGeneric.GetFileInfoSelector" - "TestS3FSGeneric.GetFileInfoSelectorWithRecursion" - "TestS3FSGeneric.GetFileInfoVector" - "TestS3FSGeneric.MoveFile" - "TestS3FSGeneric.OpenInputFile" - "TestS3FSGeneric.OpenInputFileAsync" - "TestS3FSGeneric.OpenInputFileWithFileInfo" - "TestS3FSGeneric.OpenInputStream" - "TestS3FSGeneric.OpenInputStreamAsync" - "TestS3FSGeneric.OpenInputStreamWithFileInfo" - "TestS3FSGeneric.OpenOutputStream" - "TestS3FSGeneric.SpecialChars" + "TestS3FSGeneric.*" ]; in lib.optionalString doInstallCheck "-${builtins.concatStringsSep ":" filteredTests}";