summaryrefslogtreecommitdiff
path: root/tests/guix-daemon.sh
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2019-01-21 17:41:11 +0100
committerLudovic Courtès <ludo@gnu.org>2019-01-21 23:09:55 +0100
commitf9e8a12379c6fefc9e5c3c7fc3926599bbefc013 (patch)
tree471d175466beecb53c7e0c8398dc7a85a17fc0a5 /tests/guix-daemon.sh
parentde9fbe9cdcf5f8deb08becfc54b523084fd67bda (diff)
store: Rename '&nix-error' to '&store-error'.
* guix/store.scm (&nix-error): Rename to... (&store-error): ... this, and adjust users. (&nix-connection-error): Rename to... (&store-connection-error): ... this, and adjust users. (&nix-protocol-error): Rename to... (&store-protocol-error): ... this, adjust users. (&nix-error, &nix-connection-error, &nix-protocol-error): Define these condition types and their getters as deprecrated aliases. * build-aux/run-system-tests.scm, guix/derivations.scm, guix/grafts.scm, guix/scripts/challenge.scm, guix/scripts/graph.scm, guix/scripts/lint.scm, guix/scripts/offload.scm, guix/serialization.scm, guix/ssh.scm, guix/tests.scm, guix/ui.scm, tests/derivations.scm, tests/gexp.scm, tests/guix-daemon.sh, tests/packages.scm, tests/store.scm, doc/guix.texi: Adjust to use the new names.
Diffstat (limited to 'tests/guix-daemon.sh')
-rw-r--r--tests/guix-daemon.sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/guix-daemon.sh b/tests/guix-daemon.sh
index 9ae6e0b77a6..4c19a55722f 100644
--- a/tests/guix-daemon.sh
+++ b/tests/guix-daemon.sh
@@ -1,5 +1,5 @@
1# GNU Guix --- Functional package management for GNU 1# GNU Guix --- Functional package management for GNU
2# Copyright © 2012, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org> 2# Copyright © 2012, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
3# 3#
4# This file is part of GNU Guix. 4# This file is part of GNU Guix.
5# 5#
@@ -109,7 +109,7 @@ guile -c "
109 109
110 (define (build-without-failing drv) 110 (define (build-without-failing drv)
111 (lambda (store) 111 (lambda (store)
112 (guard (c ((nix-protocol-error? c) (values #t store))) 112 (guard (c ((store-protocol-error? c) (values #t store)))
113 (build-derivations store (list drv)) 113 (build-derivations store (list drv))
114 (values #f store)))) 114 (values #f store))))
115 115
@@ -177,9 +177,9 @@ client_code='
177 `("-e" ,build) 177 `("-e" ,build)
178 #:inputs `((,bash) (,build)) 178 #:inputs `((,bash) (,build))
179 #:env-vars `(("x" . ,(random-text)))))) 179 #:env-vars `(("x" . ,(random-text))))))
180 (exit (guard (c ((nix-protocol-error? c) 180 (exit (guard (c ((store-protocol-error? c)
181 (->bool 181 (->bool
182 (string-contains (pk (nix-protocol-error-message c)) 182 (string-contains (pk (store-protocol-error-message c))
183 "failed")))) 183 "failed"))))
184 (build-derivations store (list drv)) 184 (build-derivations store (list drv))
185 #f))))' 185 #f))))'