From 8ef8de799fcbc7b1a04be0d33e1183c766d0f893 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 15 Feb 2017 21:40:08 +0100 Subject: gnu: duplicity: Fix tests. * gnu/packages/backup.scm (duplicity)[native-inputs]: Add PAR2CMDLINE. [arguments]: Move /bin/sh substitution to 'patch-source' phase and add one file. --- gnu/packages/backup.scm | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'gnu/packages/backup.scm') diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 8dbe32ebdd..809d54a646 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -67,6 +67,7 @@ (build-system python-build-system) (native-inputs `(("util-linux" ,util-linux) ;setsid command, for the tests + ("par2cmdline" ,par2cmdline) ("python-pexpect" ,python2-pexpect) ("mock" ,python2-mock))) (propagated-inputs @@ -83,16 +84,18 @@ #:test-target "test" #:phases (modify-phases %standard-phases - (add-before - 'build 'patch-source ; embed gpg store name - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "duplicity/gpginterface.py" - (("self.call = 'gpg'") - (string-append "self.call = '" (assoc-ref inputs "gnupg") "/bin/gpg'"))))) - (add-before 'check 'check-setup + (add-before 'build 'patch-source (lambda* (#:key inputs #:allow-other-keys) - (substitute* "testing/functional/__init__.py" + ;; embed gpg store name + (substitute* "duplicity/gpginterface.py" + (("self.call = 'gpg'") + (string-append "self.call = '" (assoc-ref inputs "gnupg") "/bin/gpg'"))) + (substitute* '("testing/functional/__init__.py" + "testing/overrides/bin/lftp") (("/bin/sh") (which "sh"))) + #t)) + (add-before 'check 'check-setup + (lambda* (#:key inputs #:allow-other-keys) (setenv "HOME" (getcwd)) ;gpg needs to write to $HOME (setenv "TZDIR" ;some timestamp checks need TZDIR (string-append (assoc-ref inputs "tzdata") -- cgit v1.2.3