diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2015-02-08 18:33:15 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2015-02-08 19:00:39 +0100 |
| commit | 77ee4a96f4a128d2a139a1908f7b8c5d0d97d9a8 (patch) | |
| tree | 5d8b9983bfabfc6140ce3b4dcd4a746f8e564d23 /tests/ui.scm | |
| parent | b7071bc5bb5fdf229c2f79e8b9ba06ecbf34e656 (diff) | |
| download | patches-77ee4a96f4a128d2a139a1908f7b8c5d0d97d9a8.tar patches-77ee4a96f4a128d2a139a1908f7b8c5d0d97d9a8.tar.gz | |
ui: Simplify 'show-manifest-transaction' test.
* tests/ui.scm ("show-manifest-transaction"): Remove useless call to
'manifest-transaction-effects'.
Diffstat (limited to 'tests/ui.scm')
| -rw-r--r-- | tests/ui.scm | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/tests/ui.scm b/tests/ui.scm index 236f541be2..25fc709431 100644 --- a/tests/ui.scm +++ b/tests/ui.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -230,19 +230,17 @@ Second line" 24)) (test-assert "show-manifest-transaction" (let* ((m (manifest (list guile-1.8.8))) (t (manifest-transaction (install (list guile-2.0.9))))) - (let-values (((remove install upgrade) - (manifest-transaction-effects m t))) - (with-store store - (and (string-match "guile\t1.8.8 → 2.0.9" - (with-fluids ((%default-port-encoding "UTF-8")) - (with-error-to-string - (lambda () - (show-manifest-transaction store m t))))) - (string-match "guile\t1.8.8 -> 2.0.9" - (with-fluids ((%default-port-encoding "ISO-8859-1")) - (with-error-to-string - (lambda () - (show-manifest-transaction store m t)))))))))) + (with-store store + (and (string-match "guile\t1.8.8 → 2.0.9" + (with-fluids ((%default-port-encoding "UTF-8")) + (with-error-to-string + (lambda () + (show-manifest-transaction store m t))))) + (string-match "guile\t1.8.8 -> 2.0.9" + (with-fluids ((%default-port-encoding "ISO-8859-1")) + (with-error-to-string + (lambda () + (show-manifest-transaction store m t))))))))) (test-end "ui") |