guix-commits
[Top][All Lists]
Advanced

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

03/05: tests: Augment profile collision test.


From: guix-commits
Subject: 03/05: tests: Augment profile collision test.
Date: Fri, 1 Jul 2022 17:53:27 -0400 (EDT)

civodul pushed a commit to branch master
in repository guix.

commit 9b8c442b254b82196fe2492142b3c3bbbd891a1b
Author: Ludovic Court├Ęs <ludo@gnu.org>
AuthorDate: Tue May 31 14:38:23 2022 +0200

    tests: Augment profile collision test.
    
    * tests/profiles.scm ("collision of propagated inputs"): Check the
    parents of ENTRY1 and ENTRY2.
---
 tests/profiles.scm | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/tests/profiles.scm b/tests/profiles.scm
index 7418b7470f..a026f6e238 100644
--- a/tests/profiles.scm
+++ b/tests/profiles.scm
@@ -556,14 +556,20 @@
         (return #f)))))
 
 (test-equal "collision of propagated inputs"
-  '(("guile-bootstrap" "2.0") ("guile-bootstrap" "42"))
+  '(("guile-bootstrap" "2.0") "p1"
+    <> ("guile-bootstrap" "42") "p2")
   (guard (c ((profile-collision-error? c)
              (let ((entry1 (profile-collision-error-entry c))
                    (entry2 (profile-collision-error-conflict c)))
                (list (list (manifest-entry-name entry1)
                            (manifest-entry-version entry1))
+                     (manifest-entry-name
+                      (force (manifest-entry-parent entry1)))
+                     '<>
                      (list (manifest-entry-name entry2)
-                           (manifest-entry-version entry2))))))
+                           (manifest-entry-version entry2))
+                     (manifest-entry-name
+                      (force (manifest-entry-parent entry2)))))))
     (run-with-store %store
       (mlet* %store-monad ((p0 -> (package
                                     (inherit %bootstrap-guile)



reply via email to

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