tests: Add missing module imports for marionette-evaluated code.
This missing imports became apparent with commit
a09c7da8f8, which runs the marionette
service in a fresh Guile process with fewer imports.
* gnu/tests/databases.scm (run-postgresql-test, run-timescaledb-test)
(run-mysql-test): Add missing module imports for code passed to
'marionette-eval'.
* gnu/tests/docker.scm (run-docker-test, run-docker-system-test): Likewise.
* gnu/tests/mail.scm (run-dovecot-test, run-getmail-test): Likewise.
* gnu/tests/monitoring.scm (run-zabbix-server-test): Likewise.
* gnu/tests/pam.scm (run-test-pam-limits): Likewise.
* gnu/tests/reconfigure.scm (run-switch-to-system-test)
(run-install-bootloader-test): Likewise.
* gnu/tests/security-token.scm (run-pcscd-test): Likewise.
* gnu/tests/install.scm (gui-test-program): Likewise.
* gnu/tests/telephony.scm (run-jami-test): Add modules to
the #:imported-modules argument of 'marionette-operating-system'.
[test]: Remove them from 'with-imported-modules'; remove
'with-extensions'. Add "d-bus tooling loaded" test to set up %load-path
and %load-compiled-path so the marionette process can find
guile-ac-d-bus and guile-packrat.
This commit is contained in:
Ludovic Courtès
parent
1cb0dee3a3
commit
f518882725
@ -196,7 +196,9 @@
|
||||
(marionette-eval
|
||||
'(begin
|
||||
(use-modules (ice-9 ftw)
|
||||
(ice-9 match))
|
||||
(ice-9 match)
|
||||
(rnrs io ports))
|
||||
|
||||
(current-output-port
|
||||
(open-file "/dev/console" "w0"))
|
||||
(let ((server-log-file
|
||||
@ -317,6 +319,8 @@
|
||||
(begin
|
||||
(marionette-eval
|
||||
'(begin
|
||||
(use-modules (rnrs io ports))
|
||||
|
||||
(let loop ((i 10))
|
||||
(unless (or (zero? i)
|
||||
(and (file-exists? #$%role-log-file)
|
||||
@ -331,8 +335,9 @@
|
||||
(test-assert "database creation"
|
||||
(marionette-eval
|
||||
'(begin
|
||||
(current-output-port
|
||||
(open-file "/dev/console" "w0"))
|
||||
(use-modules (guix build utils))
|
||||
|
||||
(current-output-port (open-file "/dev/console" "w0"))
|
||||
(invoke #$(file-append postgresql "/bin/psql")
|
||||
"-tA" "-c" "CREATE DATABASE test"))
|
||||
marionette))
|
||||
@ -466,7 +471,9 @@ data double PRECISION NULL
|
||||
"awesome\n"
|
||||
(marionette-eval
|
||||
'(begin
|
||||
(use-modules (ice-9 popen))
|
||||
(use-modules (ice-9 popen)
|
||||
(rnrs io ports))
|
||||
|
||||
(let* ((port (open-pipe*
|
||||
OPEN_READ
|
||||
#$(file-append mariadb "/bin/mysql") "guix"
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2019 Danny Milosavljevic <dannym@scratchpost.org>
|
||||
;;; Copyright © 2019-2022 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2019-2023 Ludovic Courtès <ludo@gnu.org>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
@ -108,6 +108,9 @@ inside %DOCKER-OS."
|
||||
'("hello world" "hi!" "JSON!" #o1777)
|
||||
(marionette-eval
|
||||
`(begin
|
||||
(use-modules (ice-9 popen)
|
||||
(ice-9 rdelim))
|
||||
|
||||
(define slurp
|
||||
(lambda args
|
||||
(let* ((port (apply open-pipe* OPEN_READ args))
|
||||
@ -242,6 +245,9 @@ inside %DOCKER-OS."
|
||||
(test-assert "load system image and run it"
|
||||
(marionette-eval
|
||||
`(begin
|
||||
(use-modules (ice-9 popen)
|
||||
(ice-9 rdelim))
|
||||
|
||||
(define (slurp command . args)
|
||||
;; Return the output from COMMAND.
|
||||
(let* ((port (apply open-pipe* OPEN_READ command args))
|
||||
|
||||
@ -1733,7 +1733,8 @@ build (current-guix) and then store a couple of full system images.")
|
||||
(setvbuf (current-output-port) 'none)
|
||||
(setvbuf (current-error-port) 'none)
|
||||
|
||||
(marionette-eval* '(use-modules (gnu installer tests))
|
||||
(marionette-eval* '(use-modules (gnu installer tests)
|
||||
(guix build utils))
|
||||
#$marionette)
|
||||
|
||||
;; Arrange so that 'converse' prints debugging output to the console.
|
||||
|
||||
@ -382,7 +382,9 @@ Subject: Hello Nice to meet you!")
|
||||
(marionette-eval
|
||||
'(begin
|
||||
(use-modules (ice-9 ftw)
|
||||
(ice-9 match))
|
||||
(ice-9 match)
|
||||
(rnrs io ports))
|
||||
|
||||
(let ((TESTBOX/new "/home/alice/Maildir/TESTBOX/new/"))
|
||||
(match (scandir TESTBOX/new)
|
||||
(("." ".." message-file)
|
||||
@ -556,7 +558,9 @@ Subject: Hello Nice to meet you!")
|
||||
(marionette-eval
|
||||
'(begin
|
||||
(use-modules (ice-9 ftw)
|
||||
(ice-9 match))
|
||||
(ice-9 match)
|
||||
(rnrs io ports))
|
||||
|
||||
(let ((TESTBOX/new "/home/alice/TestMaildir/new/"))
|
||||
(match (scandir TESTBOX/new)
|
||||
(("." ".." message-file)
|
||||
|
||||
@ -208,7 +208,11 @@ postgres|Superuser, Create role, Create DB, Replication, Bypass RLS|{}
|
||||
zabbix||{}
|
||||
"
|
||||
(marionette-eval
|
||||
'(begin (let* ((port (open-pipe #$%psql-db-zabbix-create-script
|
||||
'(begin
|
||||
(use-modules (ice-9 popen)
|
||||
(ice-9 rdelim))
|
||||
|
||||
(let* ((port (open-pipe #$%psql-db-zabbix-create-script
|
||||
OPEN_READ))
|
||||
(output (read-string port))
|
||||
(status (close-pipe port)))
|
||||
|
||||
@ -70,8 +70,10 @@
|
||||
#$(string-join (map pam-limits-entry->string pam-limit-entries)
|
||||
"\n" 'suffix)
|
||||
(marionette-eval
|
||||
'(call-with-input-file "/etc/security/limits.conf"
|
||||
get-string-all)
|
||||
'(begin
|
||||
(use-modules (rnrs io ports))
|
||||
(call-with-input-file "/etc/security/limits.conf"
|
||||
get-string-all))
|
||||
marionette))
|
||||
|
||||
(test-end)))))
|
||||
|
||||
@ -104,10 +104,11 @@ generation of the system profile."
|
||||
|
||||
(test-assert "script activated user accounts"
|
||||
(marionette-eval
|
||||
'(string-contains (call-with-input-file "/etc/passwd"
|
||||
(lambda (port)
|
||||
(get-string-all port)))
|
||||
"jakob")
|
||||
'(begin
|
||||
(use-modules (rnrs io ports))
|
||||
(string-contains (call-with-input-file "/etc/passwd"
|
||||
get-string-all)
|
||||
"jakob"))
|
||||
marionette)))
|
||||
|
||||
(test-end))))
|
||||
@ -208,9 +209,9 @@ bootloader's configuration file."
|
||||
(define (generations-in-grub-cfg marionette)
|
||||
(let ((grub-cfg (marionette-eval
|
||||
'(begin
|
||||
(use-modules (rnrs io ports))
|
||||
(call-with-input-file "/boot/grub/grub.cfg"
|
||||
(lambda (port)
|
||||
(get-string-all port))))
|
||||
get-string-all))
|
||||
marionette)))
|
||||
(map (lambda (parameter)
|
||||
(second (string-split (match:substring parameter) #\=)))
|
||||
|
||||
@ -50,7 +50,9 @@
|
||||
(test-assert "pcscd is alive"
|
||||
(marionette-eval
|
||||
'(begin
|
||||
(use-modules (gnu services herd))
|
||||
(use-modules (gnu services herd)
|
||||
(srfi srfi-1))
|
||||
|
||||
(live-service-running
|
||||
(find (lambda (live)
|
||||
(memq 'pcscd (live-service-provision live)))
|
||||
|
||||
@ -138,7 +138,9 @@ jami account used as part of the jami configuration are left *unspecified*."
|
||||
%jami-os-provisioning)
|
||||
%jami-os)
|
||||
#:imported-modules '((gnu services herd)
|
||||
(guix combinators))))
|
||||
(guix combinators)
|
||||
(gnu build jami-service)
|
||||
(gnu build dbus-service))))
|
||||
(define vm (virtual-machine
|
||||
(operating-system os)
|
||||
(memory-size 512)))
|
||||
@ -147,22 +149,13 @@ jami account used as part of the jami configuration are left *unspecified*."
|
||||
"Account.username"))
|
||||
|
||||
(define test
|
||||
(with-extensions (list guile-packrat ;used by guile-ac-d-bus
|
||||
guile-ac-d-bus
|
||||
;; Fibers is needed to provide the non-blocking
|
||||
;; variant of the 'sleep' procedure.
|
||||
guile-fibers)
|
||||
(with-imported-modules (source-module-closure
|
||||
'((gnu build marionette)
|
||||
(gnu build dbus-service)
|
||||
(gnu build jami-service)))
|
||||
'((gnu build marionette)))
|
||||
#~(begin
|
||||
(use-modules (rnrs base)
|
||||
(srfi srfi-11)
|
||||
(srfi srfi-64)
|
||||
(gnu build marionette)
|
||||
(gnu build dbus-service)
|
||||
(gnu build jami-service))
|
||||
(gnu build marionette))
|
||||
|
||||
(setenv "DBUS_SESSION_BUS_ADDRESS" "unix:path=/var/run/jami/bus")
|
||||
|
||||
@ -172,10 +165,35 @@ jami account used as part of the jami configuration are left *unspecified*."
|
||||
(test-runner-current (system-test-runner #$output))
|
||||
(test-begin "jami")
|
||||
|
||||
(test-assert "d-bus tooling loaded"
|
||||
;; Add Guile-AC-D-Bus and related libraries to the marionette's
|
||||
;; search path.
|
||||
(marionette-eval
|
||||
'(let ((libraries '(#$guile-ac-d-bus
|
||||
#$guile-packrat))) ;used by ac-d-bus
|
||||
(set! %load-path
|
||||
(append %load-path
|
||||
(map (lambda (directory)
|
||||
(string-append directory
|
||||
"/share/guile/site/"
|
||||
(effective-version)))
|
||||
libraries)))
|
||||
(set! %load-compiled-path
|
||||
(append %load-compiled-path
|
||||
(map (lambda (directory)
|
||||
(string-append directory
|
||||
"/lib/guile/3.0/site-ccache"))
|
||||
libraries)))
|
||||
%load-path)
|
||||
marionette))
|
||||
|
||||
(test-assert "service is running"
|
||||
(marionette-eval
|
||||
'(begin
|
||||
(use-modules (gnu build jami-service))
|
||||
(use-modules (gnu build jami-service)
|
||||
(gnu services herd))
|
||||
|
||||
(wait-for-service 'jami)
|
||||
(jami-service-available?))
|
||||
marionette))
|
||||
|
||||
@ -345,7 +363,7 @@ jami account used as part of the jami configuration are left *unspecified*."
|
||||
account-details)))))
|
||||
marionette))
|
||||
|
||||
(test-end)))))
|
||||
(test-end))))
|
||||
|
||||
(gexp->derivation (if provisioning?
|
||||
(if partial?
|
||||
|
||||
Loading…
Reference in New Issue
Block a user