diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2017-10-10 22:33:28 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2017-10-10 22:33:28 +0200 |
| commit | c01ef97594a8b06e884906a5efbdfacf8ba33dc3 (patch) | |
| tree | 828b4711c6ad71ab8fc9b6fc8f23f80979c5fe9b /tests | |
| parent | 86d02fa8010c053ba980e4c39373b9bf8af0561d (diff) | |
| parent | 4b8b4418e609b5e0bfb6efbc11ac28deaa437e80 (diff) | |
Merge branch 'master' into core-updates
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/import-utils.scm | 5 | ||||
| -rw-r--r-- | tests/publish.scm | 4 | ||||
| -rw-r--r-- | tests/uuid.scm | 6 |
3 files changed, 12 insertions, 3 deletions
diff --git a/tests/import-utils.scm b/tests/import-utils.scm index 3d8d2c698d..f4bbd335b9 100644 --- a/tests/import-utils.scm +++ b/tests/import-utils.scm @@ -43,7 +43,10 @@ (test-assert "alist->package with simple source" (let* ((meta '(("name" . "hello") ("version" . "2.10") - ("source" . "mirror://gnu/hello/hello-2.10.tar.gz") + ("source" . + ;; Use a 'file://' URI so that we don't cause a download. + ,(string-append "file://" + (search-path %load-path "guix.scm"))) ("build-system" . "gnu") ("home-page" . "https://gnu.org") ("synopsis" . "Say hi") diff --git a/tests/publish.scm b/tests/publish.scm index 31043f71fa..f33898fd58 100644 --- a/tests/publish.scm +++ b/tests/publish.scm @@ -340,7 +340,7 @@ FileSize: ~a~%" 200 ;nar/gzip/… #t ;Content-Length #t ;FileSize - 200) ;nar/… + 404) ;nar/… (call-with-temporary-directory (lambda (cache) (let ((thread (with-separate-output-ports @@ -393,7 +393,7 @@ FileSize: ~a~%" (let ((item (add-text-to-store %store "fake-compressed-thing.tar.gz" (random-text)))) (test-equal "with cache, uncompressed" - (list #f + (list #t `(("StorePath" . ,item) ("URL" . ,(string-append "nar/" (basename item))) ("Compression" . "none")) diff --git a/tests/uuid.scm b/tests/uuid.scm index aacce77233..91a3482490 100644 --- a/tests/uuid.scm +++ b/tests/uuid.scm @@ -57,4 +57,10 @@ "1234-ABCD" (uuid->string (uuid "1234-abcd" 'fat32))) +(test-assert "uuid=?" + (and (uuid=? (uuid-bytevector (uuid "1234-abcd" 'fat32)) + (uuid "1234-abcd" 'fat32)) + (uuid=? (uuid "1234-abcd" 'fat32) + (uuid "1234-abcd" 'fat)))) + (test-end) |