diff options
Diffstat (limited to 'gnu/tests')
| -rw-r--r-- | gnu/tests/image.scm | 23 | ||||
| -rw-r--r-- | gnu/tests/lightdm.scm | 6 |
2 files changed, 19 insertions, 10 deletions
diff --git a/gnu/tests/image.scm b/gnu/tests/image.scm index 99d34b7670..be6852cae0 100644 --- a/gnu/tests/image.scm +++ b/gnu/tests/image.scm @@ -20,7 +20,7 @@ #:use-module (gnu) #:use-module (gnu image) #:use-module (gnu tests) - #:autoload (gnu system image) (system-image root-offset) + #:autoload (gnu system image) (system-image root-offset image-with-os efi-disk-image) #:use-module (gnu system uuid) #:use-module (gnu system vm) #:use-module (gnu packages guile) @@ -153,6 +153,10 @@ (flags '(boot)) (initializer dummy-initializer)))))) +;; A efi disk image with default partitions +(define i6 + (image-with-os efi-disk-image %simple-efi-os)) + (define (run-images-test) (define test (with-imported-modules '((srfi srfi-64) @@ -202,10 +206,10 @@ (disk-get-primary-partition-count (disk-new d2-device))) (test-equal "test" - (let* ((disk (disk-new d2-device)) - (partitions (disk-partitions disk)) - (boot-partition (find normal-partition? partitions))) - (partition-get-name boot-partition))) + (let* ((disk (disk-new d2-device)) + (partitions (disk-partitions disk)) + (boot-partition (find normal-partition? partitions))) + (partition-get-name boot-partition))) ;; Image i3. (define i3-image @@ -259,6 +263,15 @@ (filter data-partition? (disk-partitions (disk-new d5-device))))) + ;; Image i6. + (define i6-image + #$(system-image i6)) + (define d6-device + (get-device i6-image)) + + (test-equal "gpt" + (disk-type-name (disk-probe d6-device))) + (test-end))))) (gexp->derivation "images-test" test)) diff --git a/gnu/tests/lightdm.scm b/gnu/tests/lightdm.scm index 6011d2c515..f1c3b67c8a 100644 --- a/gnu/tests/lightdm.scm +++ b/gnu/tests/lightdm.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>. +;;; Copyright © 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>. ;;; ;;; This file is part of GNU Guix. ;;; @@ -142,10 +142,6 @@ (test-assert "can connect to TCP port 5900 on IPv4" (wait-for-tcp-port 5900 marionette)) - ;; The VNC server fails to listen to IPv6 due to "Error binding to - ;; address [::]:5900: Address already in use" (see: - ;; https://github.com/canonical/lightdm/issues/266). - (test-expect-fail 1) (test-assert "can connect to TCP port 5900 on IPv6" (wait-for-tcp-port 5900 marionette #:address |