01/03: channels: Address test failure.

[guix-commits]

civodul pushed a commit to branch master
in repository guix.

commit 6c46e477eb50c6ee7c9b7c8199bdfb3708dc32b5
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Mon Oct 12 10:10:03 2020 +0200

    channels: Address test failure.
    
    Fixes <https://bugs.gnu.org/43940>.
    Reported by Maxim Cournoyer <maxim.cournoyer@gmail.com>.
    
    The "channel-instances->manifest" test would fail since
    1d4ab335b22a93e01c2eb1eb3e93fc6534157040: 'quiet-guile' would be passed #f
    as GUILE, and thus 'package-version' would fail with wrong-type-arg.
    
    * guix/channels.scm (whole-package-for-legacy): Pass #:guile to
    'whole-package'.
    * tests/channels.scm ("channel-instances->manifest"): Remove 
'test-expect-fail'.
---
 guix/channels.scm  | 3 ++-
 tests/channels.scm | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/guix/channels.scm b/guix/channels.scm
index ad2442f..916d663 100644
--- a/guix/channels.scm
+++ b/guix/channels.scm
@@ -783,7 +783,8 @@ modules in the old ~/.config/guix/latest style."
                    ;; derivation that builds modules.  We have to infer what 
the
                    ;; dependencies of these modules were.
                    (list guile-json-3 guile-git guile-bytestructures
-                         (ssh -> guile-ssh) (tls -> gnutls)))))
+                         (ssh -> guile-ssh) (tls -> gnutls))
+                   #:guile (default-guile))))
 
 (define (old-style-guix? drv)
   "Return true if DRV corresponds to a ~/.config/guix/latest style of
diff --git a/tests/channels.scm b/tests/channels.scm
index ba8cfe6..1b6f640 100644
--- a/tests/channels.scm
+++ b/tests/channels.scm
@@ -230,7 +230,6 @@
                                       #:current-channels (list new)
                                       #:validate-pull validate-pull)))))))
 
-(test-expect-fail 1)                    ;see: https://issues.guix.gnu.org/43940
 (test-assert "channel-instances->manifest"
   ;; Compute the manifest for a graph of instances and make sure we get a
   ;; derivation graph that mirrors the instance graph.  This test also ensures