mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-07-13 13:40:28 +03:00
Merge master into staging-next
This commit is contained in:
commit
797a2b9bcc
46 changed files with 823 additions and 672 deletions
|
@ -100,7 +100,7 @@ import ./make-test-python.nix (
|
|||
"${pkgs.restic}/bin/restic -r ${remoteRepository} -p ${passwordFile} snapshots",
|
||||
'${pkgs.restic}/bin/restic -r ${remoteFromFileRepository} -p ${passwordFile} snapshots"',
|
||||
"${pkgs.restic}/bin/restic -r ${rcloneRepository} -p ${passwordFile} snapshots",
|
||||
"grep 'backup .* /opt' /tmp/fake-restic.log",
|
||||
"grep 'backup.* /opt' /tmp/fake-restic.log",
|
||||
)
|
||||
server.succeed(
|
||||
# set up
|
||||
|
@ -129,8 +129,8 @@ import ./make-test-python.nix (
|
|||
|
||||
# test that custompackage runs both `restic backup` and `restic check` with reasonable commandlines
|
||||
"systemctl start restic-backups-custompackage.service",
|
||||
"grep 'backup .* /opt' /tmp/fake-restic.log",
|
||||
"grep 'check .* --some-check-option' /tmp/fake-restic.log",
|
||||
"grep 'backup.* /opt' /tmp/fake-restic.log",
|
||||
"grep 'check.* --some-check-option' /tmp/fake-restic.log",
|
||||
|
||||
# test that we can create four snapshots in remotebackup and rclonebackup
|
||||
"timedatectl set-time '2017-12-13 13:45'",
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue