3 files changed, 57 insertions(+), 28 deletions(-)

M Makefile.am
M tests/file-systems.scm
A tests/uuid.scm

@@ 312,6 312,7 @@ SCM_TESTS =					\
   tests/workers.scm				\
   tests/zlib.scm				\
   tests/file-systems.scm			\
+  tests/uuid.scm				\
   tests/system.scm				\
   tests/services.scm				\
   tests/scripts-build.scm			\

@@ 19,43 19,15 @@
 (define-module (test-file-systems)
   #:use-module (guix store)
   #:use-module (guix modules)
-  #:use-module (gnu system uuid)
   #:use-module (gnu system file-systems)
   #:use-module (srfi srfi-1)
   #:use-module (srfi srfi-64)
-  #:use-module (rnrs bytevectors)
   #:use-module (ice-9 match))
 
 ;; Test the (gnu system file-systems) module.
 
 (test-begin "file-systems")
 
-(test-equal "uuid->string"
-  "c5307e6b-d1ba-499d-89c5-cb0b143577c4"
-  (uuid->string
-   #vu8(197 48 126 107 209 186 73 157 137 197 203 11 20 53 119 196)))
-
-(test-equal "string->uuid"
-  '(16 "4dab5feb-d176-45de-b287-9b0a6e4c01cb")
-  (let ((uuid (string->uuid "4dab5feb-d176-45de-b287-9b0a6e4c01cb")))
-    (list (bytevector-length uuid) (uuid->string uuid))))
-
-(test-assert "uuid"
-  (let ((str "4dab5feb-d176-45de-b287-9b0a6e4c01cb"))
-    (bytevector=? (uuid-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" 'dce))))))
-
 (test-assert "file-system-needed-for-boot?"
   (let-syntax ((dummy-fs (syntax-rules ()
                            ((_ directory)

@@ 0,0 1,56 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2015, 2017 Ludovic Courtès <ludo@gnu.org>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (test-uuid)
+  #:use-module (gnu system uuid)
+  #:use-module (srfi srfi-64)
+  #:use-module (rnrs bytevectors))
+
+(test-begin "uuid")
+
+(test-equal "uuid->string"
+  "c5307e6b-d1ba-499d-89c5-cb0b143577c4"
+  (uuid->string
+   #vu8(197 48 126 107 209 186 73 157 137 197 203 11 20 53 119 196)))
+
+(test-equal "string->uuid"
+  '(16 "4dab5feb-d176-45de-b287-9b0a6e4c01cb")
+  (let ((uuid (string->uuid "4dab5feb-d176-45de-b287-9b0a6e4c01cb")))
+    (list (bytevector-length uuid) (uuid->string uuid))))
+
+(test-assert "uuid"
+  (let ((str "4dab5feb-d176-45de-b287-9b0a6e4c01cb"))
+    (bytevector=? (uuid-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" 'dce))))))
+
+(test-equal "uuid, ISO-9660, format preserved"
+  "1970-01-01-17-14-42-99"
+  (uuid->string (uuid "1970-01-01-17-14-42-99" 'iso9660)))
+
+(test-end)