~ruther/guix-local

01e82af55fa9823be36e2bd94868bb7b32f0fd73 — Ludovic Courtès 12 years ago bde2d9c
tests: Fix max-silent-time test.

* tests/derivations.scm ("build-expression->derivation and
  max-silent-time"): Use STORE instead of %STORE.  Change BUILDER to
  succeed by default.  Return #f when no exception is raised.
1 files changed, 4 insertions(+), 3 deletions(-)

M tests/derivations.scm
M tests/derivations.scm => tests/derivations.scm +4 -3
@@ 419,8 419,8 @@
  (let* ((store      (let ((s (open-connection)))
                       (set-build-options s #:max-silent-time 1)
                       s))
         (builder    '(sleep 100))
         (drv        (build-expression->derivation %store "silent"
         (builder    '(begin (sleep 100) (mkdir %output) #t))
         (drv        (build-expression->derivation store "silent"
                                                   (%current-system)
                                                   builder '()))
         (out-path   (derivation->output-path drv)))


@@ 428,7 428,8 @@
               (and (string-contains (nix-protocol-error-message c)
                                     "failed")
                    (not (valid-path? store out-path)))))
      (build-derivations %store (list drv)))))
      (build-derivations store (list drv))
      #f)))

(test-assert "build-expression->derivation and derivation-prerequisites-to-build"
  (let ((drv (build-expression->derivation %store "fail" (%current-system)