From 72cd8ec0b1465ddf5465bc2d75b3ca343aad99dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 20 Jul 2015 13:36:36 +0200 Subject: [PATCH] tests: Make #:references-graphs gexp test more tolerant. * tests/gexp.scm ("gexp->derivation #:references-graphs"): Use 'lset=' instead of 'equal?' since the order in which references are listed in not guaranteed. --- tests/gexp.scm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/tests/gexp.scm b/tests/gexp.scm index 740d74620e..0749811ea8 100644 --- a/tests/gexp.scm +++ b/tests/gexp.scm @@ -511,7 +511,7 @@ (define (match-input thing) (test-assertm "gexp->derivation #:references-graphs" (mlet* %store-monad - ((one (text-file "one" "hello, world")) + ((one (text-file "one" (random-text))) (two (gexp->derivation "two" #~(symlink #$one #$output:chbouib))) (drv (gexp->derivation "ref-graphs" @@ -544,12 +544,14 @@ (define (match-input thing) (g-guile -> (derivation->output-path drv))) (return (and ok? (equal? (call-with-input-file g-one read) (list one)) - (equal? (call-with-input-file g-two read) - (list one (derivation->output-path two "chbouib"))) + (lset= string=? + (call-with-input-file g-two read) + (list one (derivation->output-path two "chbouib"))) ;; Note: %BOOTSTRAP-GUILE depends on the bootstrap Bash. - (equal? (call-with-input-file g-guile read) - (list (derivation->output-path guile-drv) bash)))))) + (lset= string=? + (call-with-input-file g-guile read) + (list (derivation->output-path guile-drv) bash)))))) (test-assertm "gexp->derivation #:allowed-references" (mlet %store-monad ((drv (gexp->derivation "allowed-refs"