diff options
| author | Mathieu Othacehe <othacehe@gnu.org> | 2020-09-10 14:59:21 +0200 |
|---|---|---|
| committer | Mathieu Othacehe <othacehe@gnu.org> | 2020-09-10 14:59:53 +0200 |
| commit | 6e71514a2992eed1cfa2306f65ca750d65708bc4 (patch) | |
| tree | 9d479c0ca994be8486a229b701ef60dc12fd41ab | |
| parent | d3fe4590de4597c6e15d9ca3916987c0a1b0f263 (diff) | |
| download | guix-6e71514a2992eed1cfa2306f65ca750d65708bc4.tar guix-6e71514a2992eed1cfa2306f65ca750d65708bc4.tar.gz | |
tests: install: Fix gui-installed-desktop-os-encrypted test.
* gnu/tests/base.scm (run-basic-test): Add a 'desktop?' argument. Wait 30
seconds before trying to switch to TTY1 on desktop.
* gnu/tests/install.scm (guided-installation-test): Use 512MiB of RAM and pass
the desktop argument to "run-basic-test".
| -rw-r--r-- | gnu/tests/base.scm | 11 | ||||
| -rw-r--r-- | gnu/tests/install.scm | 5 |
2 files changed, 13 insertions, 3 deletions
diff --git a/gnu/tests/base.scm b/gnu/tests/base.scm index 086d2a133f..482310cc12 100644 --- a/gnu/tests/base.scm +++ b/gnu/tests/base.scm @@ -55,7 +55,10 @@ (define* (run-basic-test os command #:optional (name "basic") - #:key initialization root-password) + #:key + initialization + root-password + desktop?) "Return a derivation called NAME that tests basic features of the OS started using COMMAND, a gexp that evaluates to a list of strings. Compare some properties of running system to what's declared in OS, an <operating-system>. @@ -300,6 +303,12 @@ info --version") (test-equal "login on tty1" "root\n" (begin + ;; XXX: On desktop, GDM3 will switch to TTY7. If this happens + ;; after we switched to TTY1, we won't be able to login. Make + ;; sure to wait long enough before switching to TTY1. + (when #$desktop? + (sleep 30)) + (marionette-control "sendkey ctrl-alt-f1" marionette) ;; Wait for the 'term-tty1' service to be running (using ;; 'start-service' is the simplest and most reliable way to do diff --git a/gnu/tests/install.scm b/gnu/tests/install.scm index 9656e5f41f..5b7f9bf671 100644 --- a/gnu/tests/install.scm +++ b/gnu/tests/install.scm @@ -1317,10 +1317,11 @@ build (current-guix) and then store a couple of full system images.") marionette #:desktop? desktop? #:encrypted? encrypted?)))) - (command (qemu-command/writable-image image))) + (command (qemu-command/writable-image image #:memory-size 512))) (run-basic-test target-os command name #:initialization (and encrypted? enter-luks-passphrase) - #:root-password %root-password))))) + #:root-password %root-password + #:desktop? desktop?))))) (define %test-gui-installed-os (guided-installation-test |