mirror of
https://github.com/CHN-beta/nixpkgs.git
synced 2026-01-12 02:40:31 +08:00
[Backport release-25.11] nixosTests.syncthing-many-devices: fix (#472467)
This commit is contained in:
@@ -1457,9 +1457,7 @@ in
|
||||
syncthing-guiPassword = runTest ./syncthing/guiPassword.nix;
|
||||
syncthing-guiPasswordFile = runTest ./syncthing/guiPasswordFile.nix;
|
||||
syncthing-init = runTest ./syncthing/init.nix;
|
||||
# FIXME: Test has been failing since 2025-07-06:
|
||||
# https://github.com/NixOS/nixpkgs/issues/447674
|
||||
# syncthing-many-devices = runTest ./syncthing/many-devices.nix;
|
||||
syncthing-many-devices = runTest ./syncthing/many-devices.nix;
|
||||
syncthing-no-settings = runTest ./syncthing/no-settings.nix;
|
||||
syncthing-relay = runTest ./syncthing/relay.nix;
|
||||
sysfs = runTest ./sysfs.nix;
|
||||
|
||||
@@ -138,12 +138,26 @@ let
|
||||
(printf "X-API-Key: "; cat "$RUNTIME_DIRECTORY/api_key") >"$RUNTIME_DIRECTORY/headers"
|
||||
|
||||
${pkgs.curl}/bin/curl -sSLk -H "@$RUNTIME_DIRECTORY/headers" \
|
||||
--retry 1000 --retry-delay 1 --retry-all-errors \
|
||||
--retry 5 --retry-delay 1 --retry-all-errors \
|
||||
"$@"
|
||||
}
|
||||
curl -d ${lib.escapeShellArg (builtins.toJSON { deviceID = IDsToDelete.device; })} \
|
||||
curl -d ${
|
||||
lib.escapeShellArg (
|
||||
builtins.toJSON {
|
||||
deviceID = IDsToDelete.device;
|
||||
name = "DeleteMe";
|
||||
}
|
||||
)
|
||||
} \
|
||||
-X POST 127.0.0.1:8384/rest/config/devices
|
||||
curl -d ${lib.escapeShellArg (builtins.toJSON { id = IDsToDelete.folder; })} \
|
||||
curl -d ${
|
||||
lib.escapeShellArg (
|
||||
builtins.toJSON {
|
||||
id = IDsToDelete.folder;
|
||||
path = "/var/lib/syncthing/DeleteMe";
|
||||
}
|
||||
)
|
||||
} \
|
||||
-X POST 127.0.0.1:8384/rest/config/folders
|
||||
'';
|
||||
in
|
||||
|
||||
Reference in New Issue
Block a user