unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
* [bug#70203] [PATCH] gnu: tests: Add system tests for sddm
@ 2024-04-04 21:21 Richard Sent
  2024-04-15  9:34 ` bug#70203: " Christopher Baines
  0 siblings, 1 reply; 2+ messages in thread
From: Richard Sent @ 2024-04-04 21:21 UTC (permalink / raw)
  To: 70203; +Cc: Richard Sent

* gnu/tests/sddm.scm: Create a basic suite of tests to verify the display
manager starts.

Change-Id: Ia84926e9aab42c6781430c22aae0f892387d1a29
---
Hi Guix!

Given https://issues.guix.gnu.org/70194 I figured it was prudent to
create a test suite for SDDM similar to GDM and LightDM.

I verified this on c9cd16c630, since SDDM seems to be broken since at
least 188d18fc47 (probably earlier). I imagine this should go in after
70194 is closed. Or perhaps there's something horribly wrong with my
machine and this does work on master.

Either way, the more tests the merrier, right?

 gnu/tests/sddm.scm | 112 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 112 insertions(+)
 create mode 100644 gnu/tests/sddm.scm

diff --git a/gnu/tests/sddm.scm b/gnu/tests/sddm.scm
new file mode 100644
index 0000000000..87059112ee
--- /dev/null
+++ b/gnu/tests/sddm.scm
@@ -0,0 +1,112 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2024 Richard Sent <richard@freakingpenguin.com>.
+;;;
+;;; 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 (gnu tests sddm)
+  #:use-module (gnu bootloader)
+  #:use-module (gnu bootloader grub)
+  #:use-module (gnu packages)
+  #:use-module (gnu packages ocr)
+  #:use-module (gnu packages xorg)
+  #:use-module (gnu services)
+  #:use-module (gnu services desktop)
+  #:use-module (gnu services sddm)
+  #:use-module (gnu services xorg)
+  #:use-module (gnu system)
+  #:use-module (gnu system vm)
+  #:use-module (gnu tests)
+  #:use-module (guix gexp)
+  #:use-module (guix modules)
+  #:use-module (srfi srfi-1)
+  #:export (%test-sddm))
+
+(define %sddm-os
+  (operating-system
+    (inherit %simple-os)
+    (services
+     (cons* (service sddm-service-type)
+            (modify-services %desktop-services
+              (delete gdm-service-type))))))
+
+(define (run-sddm-test)
+  "Run tests in %SDDM-OS."
+
+  (define os (marionette-operating-system
+              %sddm-os
+              #:imported-modules (source-module-closure
+                                  '((gnu services herd)))))
+
+  (define vm (virtual-machine
+              (operating-system os)
+              ;; Test may nondeterministically fail with default memory size.
+              (memory-size 1024)))
+
+  (define test
+    (with-imported-modules (source-module-closure
+                            '((gnu build marionette)))
+      #~(begin
+          (use-modules (gnu build marionette)
+                       (srfi srfi-26)
+                       (srfi srfi-64))
+
+          (let ((marionette (make-marionette (list #$vm))))
+
+            (test-runner-current (system-test-runner #$output))
+            (test-begin "sddm")
+
+            (test-assert "service is running"
+              (marionette-eval
+               '(begin
+                  (use-modules (gnu services herd))
+                  ;; sddm's shepherd service is called xorg-server
+                  (start-service 'xorg-server))
+               marionette))
+
+            (test-assert "service can be stopped"
+              (marionette-eval
+               '(begin
+                  (use-modules (gnu services herd))
+                  (stop-service 'xorg-server))
+               marionette))
+
+            (test-assert "service can be restarted"
+              (marionette-eval
+               '(begin
+                  (use-modules (gnu services herd))
+                  (restart-service 'xorg-server))
+               marionette))
+
+            (test-assert "login screen up"
+              ;; GNU Ocrad fails to recognize any text, so use Tesseract.
+              (wait-for-screen-text marionette
+                                    ;; Login button not recognized, use SDDM's
+                                    ;; welcome message.
+                                    (cut string-contains <> (string-append "Welcome to "
+                                                                           #$(operating-system-host-name %sddm-os)))
+                                    #:ocr #$(file-append tesseract-ocr
+                                                         "/bin/tesseract")
+                                    #:timeout 60))
+
+            (test-end)))))
+
+  (gexp->derivation "sddm-test" test))
+
+(define %test-sddm
+  (system-test
+   (name "sddm")
+   (description "Basic tests for the SDDM service.")
+   (value (run-sddm-test))))

base-commit: ade6845da6cec99f3bca46faac9b2bad6877817e
-- 
2.41.0





^ permalink raw reply related	[flat|nested] 2+ messages in thread

* bug#70203: [PATCH] gnu: tests: Add system tests for sddm
  2024-04-04 21:21 [bug#70203] [PATCH] gnu: tests: Add system tests for sddm Richard Sent
@ 2024-04-15  9:34 ` Christopher Baines
  0 siblings, 0 replies; 2+ messages in thread
From: Christopher Baines @ 2024-04-15  9:34 UTC (permalink / raw)
  To: Richard Sent; +Cc: 70203-done

[-- Attachment #1: Type: text/plain, Size: 912 bytes --]

Richard Sent <richard@freakingpenguin.com> writes:

> * gnu/tests/sddm.scm: Create a basic suite of tests to verify the display
> manager starts.
>
> Change-Id: Ia84926e9aab42c6781430c22aae0f892387d1a29
> ---
> Hi Guix!
>
> Given https://issues.guix.gnu.org/70194 I figured it was prudent to
> create a test suite for SDDM similar to GDM and LightDM.
>
> I verified this on c9cd16c630, since SDDM seems to be broken since at
> least 188d18fc47 (probably earlier). I imagine this should go in after
> 70194 is closed. Or perhaps there's something horribly wrong with my
> machine and this does work on master.
>
> Either way, the more tests the merrier, right?
>
>  gnu/tests/sddm.scm | 112 +++++++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 112 insertions(+)
>  create mode 100644 gnu/tests/sddm.scm

Looks good to me, I've pushed this to master as
027419626f171cdccf9c4a77686840141ea502eb.

Chris

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 987 bytes --]

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2024-04-15  9:35 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-04-04 21:21 [bug#70203] [PATCH] gnu: tests: Add system tests for sddm Richard Sent
2024-04-15  9:34 ` bug#70203: " Christopher Baines

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).