diff options
| author | Mark H Weaver <mhw@netris.org> | 2015-07-19 18:12:34 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2015-07-19 18:12:34 -0400 |
| commit | 1b4e48d498a96d478baa1aae7d9c7ecdbd817d6f (patch) | |
| tree | 4b650999e49a6f4d3dd116fab3f9ee8222247e07 /tests | |
| parent | aa27987f71cb8afa698ede551e20b1248f160113 (diff) | |
| parent | 50c7a1e297bff0935674b4f30e854a8889becfdd (diff) | |
| download | guix-1b4e48d498a96d478baa1aae7d9c7ecdbd817d6f.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/file-systems.scm | 10 | ||||
| -rw-r--r-- | tests/publish.scm | 2 |
2 files changed, 11 insertions, 1 deletions
diff --git a/tests/file-systems.scm b/tests/file-systems.scm index d445b4971f..c36509b2b0 100644 --- a/tests/file-systems.scm +++ b/tests/file-systems.scm @@ -40,6 +40,16 @@ (bytevector=? (uuid "4dab5feb-d176-45de-b287-9b0a6e4c01cb") (string->uuid "4dab5feb-d176-45de-b287-9b0a6e4c01cb")))) +(test-assert "uuid, syntax error" + (catch 'syntax-error + (lambda () + (eval '(uuid "foobar") (current-module)) + #f) + (lambda (key proc message location form . args) + (and (eq? proc 'uuid) + (string-contains message "invalid UUID") + (equal? form '(uuid "foobar")))))) + (test-end) diff --git a/tests/publish.scm b/tests/publish.scm index 60f57a8ddb..4d72fdc468 100644 --- a/tests/publish.scm +++ b/tests/publish.scm @@ -81,7 +81,7 @@ NarSize: ~d References: ~a~%" %item (basename %item) - (bytevector->base32-string + (bytevector->nix-base32-string (path-info-hash info)) (path-info-nar-size info) (basename (first (path-info-references info))))) |