guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

04/06: ui: Simplify 'show-manifest-transaction' test.


From: Ludovic Courtès
Subject: 04/06: ui: Simplify 'show-manifest-transaction' test.
Date: Sun, 08 Feb 2015 18:01:06 +0000

civodul pushed a commit to branch master
in repository guix.

commit 77ee4a96f4a128d2a139a1908f7b8c5d0d97d9a8
Author: Ludovic Courtès <address@hidden>
Date:   Sun Feb 8 18:33:15 2015 +0100

    ui: Simplify 'show-manifest-transaction' test.
    
    * tests/ui.scm ("show-manifest-transaction"): Remove useless call to
      'manifest-transaction-effects'.
---
 tests/ui.scm |   26 ++++++++++++--------------
 1 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/tests/ui.scm b/tests/ui.scm
index 236f541..25fc709 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 <address@hidden>
+;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <address@hidden>
 ;;;
 ;;; 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")
 



reply via email to

[Prev in Thread] Current Thread [Next in Thread]