diff options
author | Marius Bakke <mbakke@fastmail.com> | 2017-05-22 14:56:50 +0200 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2017-05-22 14:56:50 +0200 |
commit | e4cddbbcac752090585baed5b15e2eb4af713284 (patch) | |
tree | 7a103d8d96beeb4ae5a28b1f575a70a0b6514501 /gnu/tests | |
parent | 98bb983ca7ea2b393021bfee155a72b1c6183f72 (diff) | |
parent | 74297231be34afbd9d0182651a75f40c60973ec3 (diff) | |
download | patches-e4cddbbcac752090585baed5b15e2eb4af713284.tar patches-e4cddbbcac752090585baed5b15e2eb4af713284.tar.gz |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/tests')
-rw-r--r-- | gnu/tests/base.scm | 22 | ||||
-rw-r--r-- | gnu/tests/nfs.scm | 3 |
2 files changed, 24 insertions, 1 deletions
diff --git a/gnu/tests/base.scm b/gnu/tests/base.scm index 37aab8ef67..e5ac320b74 100644 --- a/gnu/tests/base.scm +++ b/gnu/tests/base.scm @@ -199,6 +199,28 @@ info --version") ',users+homes)) marionette))) + (test-equal "no extra home directories" + '() + + ;; Make sure the home directories that are not supposed to be + ;; created are indeed not created. + (let ((nonexistent + '#$(filter-map (lambda (user) + (and (not + (user-account-create-home-directory? + user)) + (user-account-home-directory user))) + (operating-system-user-accounts os)))) + (marionette-eval + `(begin + (use-modules (srfi srfi-1)) + + ;; Note: Do not flag "/var/empty". + (filter file-exists? + ',(remove (cut string-prefix? "/var/" <>) + nonexistent))) + marionette))) + (test-equal "login on tty1" "root\n" (begin diff --git a/gnu/tests/nfs.scm b/gnu/tests/nfs.scm index 1f28f5a5b8..9e1ac1d55a 100644 --- a/gnu/tests/nfs.scm +++ b/gnu/tests/nfs.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2016 John Darrington <jmd@gnu.org> +;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -19,8 +20,8 @@ (define-module (gnu tests nfs) #:use-module (gnu tests) + #:use-module (gnu bootloader grub) #:use-module (gnu system) - #:use-module (gnu system grub) #:use-module (gnu system file-systems) #:use-module (gnu system shadow) #:use-module (gnu system vm) |