diff options
| author | Ricardo Wurmus <rekado@elephly.net> | 2019-01-23 12:08:27 +0100 |
|---|---|---|
| committer | Ricardo Wurmus <rekado@elephly.net> | 2019-01-23 12:08:27 +0100 |
| commit | 5aaef5c5decbf4dd43dfd1bb8d2a7d9e049a8580 (patch) | |
| tree | 9f4ce853b9bc2d2b5433d8f0bec18749e93d8ba3 /tests/guix-daemon.sh | |
| parent | 38f77be464b0b6ca76105d5f0a1b5e55fd694036 (diff) | |
| parent | 6a6799b27af8646da112d51bedb8e5ff6158e425 (diff) | |
| download | patches-5aaef5c5decbf4dd43dfd1bb8d2a7d9e049a8580.tar patches-5aaef5c5decbf4dd43dfd1bb8d2a7d9e049a8580.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'tests/guix-daemon.sh')
| -rw-r--r-- | tests/guix-daemon.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/guix-daemon.sh b/tests/guix-daemon.sh index 9ae6e0b77a..4c19a55722 100644 --- a/tests/guix-daemon.sh +++ b/tests/guix-daemon.sh @@ -1,5 +1,5 @@ # GNU Guix --- Functional package management for GNU -# Copyright © 2012, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org> +# Copyright © 2012, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org> # # This file is part of GNU Guix. # @@ -109,7 +109,7 @@ guile -c " (define (build-without-failing drv) (lambda (store) - (guard (c ((nix-protocol-error? c) (values #t store))) + (guard (c ((store-protocol-error? c) (values #t store))) (build-derivations store (list drv)) (values #f store)))) @@ -177,9 +177,9 @@ client_code=' `("-e" ,build) #:inputs `((,bash) (,build)) #:env-vars `(("x" . ,(random-text)))))) - (exit (guard (c ((nix-protocol-error? c) + (exit (guard (c ((store-protocol-error? c) (->bool - (string-contains (pk (nix-protocol-error-message c)) + (string-contains (pk (store-protocol-error-message c)) "failed")))) (build-derivations store (list drv)) #f))))' |