mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-11-18 12:47:33 -05:00
278d486b0c
Fixes a regression introduced in
7208995426 whereby (gnu system
file-systems) would pull in (gnu packages …) module, which in turn
breaks when importing things like (gnu build shepherd).
* gnu/system/file-systems.scm (file-system-type-predicate): Export.
(file-system-packages): Move to...
* gnu/system/linux-initrd.scm (file-system-packages): ... here. Add
docstring.
* gnu/services/base.scm: Use it.
* tests/file-systems.scm ("does not pull (gnu packages …)"): New test.
93 lines
3.5 KiB
Scheme
93 lines
3.5 KiB
Scheme
;;; 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-file-systems)
|
|
#:use-module (guix store)
|
|
#:use-module (guix modules)
|
|
#: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 "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-assert "file-system-needed-for-boot?"
|
|
(let-syntax ((dummy-fs (syntax-rules ()
|
|
((_ directory)
|
|
(file-system
|
|
(device "foo")
|
|
(mount-point directory)
|
|
(type "ext4"))))))
|
|
(parameterize ((%store-prefix "/gnu/guix/store"))
|
|
(and (file-system-needed-for-boot? (dummy-fs "/"))
|
|
(file-system-needed-for-boot? (dummy-fs "/gnu"))
|
|
(file-system-needed-for-boot? (dummy-fs "/gnu/guix"))
|
|
(file-system-needed-for-boot? (dummy-fs "/gnu/guix/store"))
|
|
(not (file-system-needed-for-boot?
|
|
(dummy-fs "/gnu/guix/store/foo")))
|
|
(not (file-system-needed-for-boot? (dummy-fs "/gn")))
|
|
(not (file-system-needed-for-boot?
|
|
(file-system
|
|
(inherit (dummy-fs (%store-prefix)))
|
|
(device "/foo")
|
|
(flags '(bind-mount read-only)))))))))
|
|
|
|
(test-assert "does not pull (guix config)"
|
|
;; This module is meant both for the host side and "build side", so make
|
|
;; sure it doesn't pull in (guix config), which depends on the user's
|
|
;; config.
|
|
(not (member '(guix config)
|
|
(source-module-closure '((gnu system file-systems))))))
|
|
|
|
(test-equal "does not pull (gnu packages …)"
|
|
;; Same story: (gnu packages …) should not be pulled.
|
|
#f
|
|
(find (match-lambda
|
|
(('gnu 'packages _ ..1) #t)
|
|
(_ #f))
|
|
(source-module-closure '((gnu system file-systems)))))
|
|
|
|
(test-end)
|