From ed86661d937c026959f2ccf68b9869b08ff32fef Mon Sep 17 00:00:00 2001 From: Kevin Cox Date: Sat, 22 Feb 2025 11:03:54 -0500 Subject: [PATCH] cross-seed: Remove broken test. This test has always been broken. The fix is not obvious, there was an attempt to set up mount namespaces, but this will fail if the output directory doesn't exist. In the default configuration it will fail because the directory doesn't exist until cross-seed runs the first time. This points at a real issue with the module that should be addressed. But for now let's remove the broken test, then we can add it back in working condition. Original PR: https://github.com/NixOS/nixpkgs/pull/383409 --- nixos/tests/all-tests.nix | 1 - nixos/tests/cross-seed.nix | 43 -------------------------- pkgs/by-name/cr/cross-seed/package.nix | 3 -- 3 files changed, 47 deletions(-) delete mode 100644 nixos/tests/cross-seed.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index de8d97bd2e5f..a580f0f78706 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -253,7 +253,6 @@ in { curl-impersonate = handleTest ./curl-impersonate.nix {}; custom-ca = handleTest ./custom-ca.nix {}; croc = handleTest ./croc.nix {}; - cross-seed = runTest ./cross-seed.nix; cyrus-imap = runTest ./cyrus-imap.nix; darling = handleTest ./darling.nix {}; darling-dmg = runTest ./darling-dmg.nix; diff --git a/nixos/tests/cross-seed.nix b/nixos/tests/cross-seed.nix deleted file mode 100644 index c50f0da2dbef..000000000000 --- a/nixos/tests/cross-seed.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ lib, ... }: -let - apiKey = "twentyfourcharacterskey!"; -in -{ - name = "cross-seed"; - meta.maintainers = with lib.maintainers; [ pta2002 ]; - - nodes.machine = - { pkgs, config, ... }: - let - cfg = config.services.cross-seed; - in - { - systemd.tmpfiles.settings."0-cross-seed-test"."${cfg.settings.torrentDir}".d = { - inherit (cfg) user group; - mode = "700"; - }; - - services.cross-seed = { - enable = true; - settings = { - outputDir = "/var/lib/cross-seed/output"; - torrentDir = "/var/lib/torrents"; - torznab = [ ]; - useClientTorrents = false; - }; - # # We create this secret in the Nix store (making it readable by everyone). - # # DO NOT DO THIS OUTSIDE OF TESTS!! - settingsFile = (pkgs.formats.json { }).generate "secrets.json" { - inherit apiKey; - }; - }; - }; - - testScript = # python - '' - start_all() - machine.wait_for_unit("cross-seed.service") - machine.wait_for_open_port(2468) - machine.succeed("curl --fail -XPOST http://localhost:2468/api/search?apiKey=${apiKey}") - ''; -} diff --git a/pkgs/by-name/cr/cross-seed/package.nix b/pkgs/by-name/cr/cross-seed/package.nix index 6bc0eda1fb85..b44b9e0ba8f4 100644 --- a/pkgs/by-name/cr/cross-seed/package.nix +++ b/pkgs/by-name/cr/cross-seed/package.nix @@ -2,7 +2,6 @@ lib, buildNpmPackage, fetchFromGitHub, - nixosTests, }: buildNpmPackage rec { @@ -18,8 +17,6 @@ buildNpmPackage rec { npmDepsHash = "sha256-hqQi0kSPm9SKEoLu6InvRMPxbQ+CBpKVPJhhOdo2ZII="; - passthru.tests.cross-seed = nixosTests.cross-seed; - meta = { description = "Fully-automatic torrent cross-seeding with Torznab"; homepage = "https://cross-seed.org";