From f51888272558d98cf5c196b93fb6c499056fbf6c Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 6 May 2023 15:07:09 +0200 Subject: tests: Add missing module imports for marionette-evaluated code. This missing imports became apparent with commit a09c7da8f8d8e732f969cf0a09aaa78f87032ab1, 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. --- gnu/tests/docker.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'gnu/tests/docker.scm') diff --git a/gnu/tests/docker.scm b/gnu/tests/docker.scm index 0276e398a7..c084ac53ee 100644 --- a/gnu/tests/docker.scm +++ b/gnu/tests/docker.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019 Danny Milosavljevic -;;; Copyright © 2019-2022 Ludovic Courtès +;;; Copyright © 2019-2023 Ludovic Courtès ;;; ;;; 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)) -- cgit v1.2.3