summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakob L. Kreuze <zerodaysfordays@sdf.lonestar.org>2019-08-07 08:42:42 -0400
committerChristopher Lemmer Webber <cwebber@dustycloud.org>2019-08-07 15:27:09 -0400
commitec12235ce207821027971c9d5f47b660b29f5ed5 (patch)
treeffd3de4672eb0879848a442d92ffc982d17d82fb
parent355ba48c463a786149cb6bef8396090c0d6d3498 (diff)
downloadpatches-ec12235ce207821027971c9d5f47b660b29f5ed5.tar
patches-ec12235ce207821027971c9d5f47b660b29f5ed5.tar.gz
reconfigure: Improve tests for system activation.
* gnu/tests/reconfigure.scm (run-switch-to-system-test): Assert that '/run/current-system' points to the activated system, and that new user accounts specified in the operating system declaration are created.
-rw-r--r--gnu/tests/reconfigure.scm32
1 files changed, 29 insertions, 3 deletions
diff --git a/gnu/tests/reconfigure.scm b/gnu/tests/reconfigure.scm
index 3a2f0a2e53..fb11e6164e 100644
--- a/gnu/tests/reconfigure.scm
+++ b/gnu/tests/reconfigure.scm
@@ -19,8 +19,10 @@
(define-module (gnu tests reconfigure)
#:use-module (gnu bootloader)
#:use-module (gnu services shepherd)
- #:use-module (gnu system vm)
#:use-module (gnu system)
+ #:use-module (gnu system accounts)
+ #:use-module (gnu system shadow)
+ #:use-module (gnu system vm)
#:use-module (gnu tests)
#:use-module (guix derivations)
#:use-module (guix gexp)
@@ -43,7 +45,13 @@
generation of the system profile."
(define os
(marionette-operating-system
- (simple-operating-system)
+ (operating-system
+ (inherit (simple-operating-system))
+ (users (cons (user-account
+ (name "jakob")
+ (group "users")
+ (home-directory "/home/jakob"))
+ %base-user-accounts)))
#:imported-modules '((gnu services herd)
(guix combinators))))
@@ -84,7 +92,25 @@ generation of the system profile."
(test-equal "script created new generation"
(length (system-generations marionette))
- (1+ (length generations-prior))))
+ (1+ (length generations-prior)))
+
+ (test-assert "script activated the new generation"
+ (and (eqv? 'symlink
+ (marionette-eval
+ '(stat:type (lstat "/run/current-system"))
+ marionette))
+ (string= #$os
+ (marionette-eval
+ '(readlink "/run/current-system")
+ marionette))))
+
+ (test-assert "script activated user accounts"
+ (marionette-eval
+ '(string-contains (call-with-input-file "/etc/passwd"
+ (lambda (port)
+ (get-string-all port)))
+ "jakob")
+ marionette)))
(test-end)
(exit (= (test-runner-fail-count (test-runner-current)) 0)))))