ui: Simplify 'show-manifest-transaction' test.

* tests/ui.scm ("show-manifest-transaction"): Remove useless call to
  'manifest-transaction-effects'.
This commit is contained in:
Ludovic Courtès 2015-02-08 18:33:15 +01:00
parent b7071bc5bb
commit 77ee4a96f4
1 changed files with 12 additions and 14 deletions

View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; 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. ;;; This file is part of GNU Guix.
;;; ;;;
@ -230,19 +230,17 @@ Second line" 24))
(test-assert "show-manifest-transaction" (test-assert "show-manifest-transaction"
(let* ((m (manifest (list guile-1.8.8))) (let* ((m (manifest (list guile-1.8.8)))
(t (manifest-transaction (install (list guile-2.0.9))))) (t (manifest-transaction (install (list guile-2.0.9)))))
(let-values (((remove install upgrade) (with-store store
(manifest-transaction-effects m t))) (and (string-match "guile\t1.8.8 → 2.0.9"
(with-store store (with-fluids ((%default-port-encoding "UTF-8"))
(and (string-match "guile\t1.8.8 → 2.0.9" (with-error-to-string
(with-fluids ((%default-port-encoding "UTF-8")) (lambda ()
(with-error-to-string (show-manifest-transaction store m t)))))
(lambda () (string-match "guile\t1.8.8 -> 2.0.9"
(show-manifest-transaction store m t))))) (with-fluids ((%default-port-encoding "ISO-8859-1"))
(string-match "guile\t1.8.8 -> 2.0.9" (with-error-to-string
(with-fluids ((%default-port-encoding "ISO-8859-1")) (lambda ()
(with-error-to-string (show-manifest-transaction store m t)))))))))
(lambda ()
(show-manifest-transaction store m t))))))))))
(test-end "ui") (test-end "ui")