ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-25 05:48:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

tests: Fix the Jami service system tests.

Browse source 
This fixes a regression introduced with commit a09c7da ("tests: Fork and exec
a new Guile for the marionette REPL.") and only partially fixed with the
follow-up commit f518882 (" tests: Add missing module imports for
marionette-evaluated code.").

* gnu/tests/telephony.scm (run-jami-test): Remove extraneous module imports.
Move the setting of the DBUS_SESSION_BUS_ADDRESS environment variable inside
the first marionette-eval'd setup test.
["service can be stopped"]: Add missing (gnu build dbus-service) module.
This commit is contained in:
Maxim Cournoyer 2023-05-25 09:46:23 -04:00
parent db883ed5d7
commit 99fc7e5dd3
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
gnu/tests/telephony.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>.
;;; Copyright © 2021, 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>.
;;;
;;; This file is part of GNU Guix.
;;;
@ -152,13 +152,9 @@ (define test
(with-imported-modules (source-module-closure
'((gnu build marionette)))
#~(begin
(use-modules (rnrs base)
(srfi srfi-11)
(srfi srfi-64)
(use-modules (srfi srfi-64)
(gnu build marionette))
(setenv "DBUS_SESSION_BUS_ADDRESS" "unix:path=/var/run/jami/bus")
(define marionette
(make-marionette (list #$vm)))
@ -171,6 +167,7 @@ (define marionette
(marionette-eval
'(let ((libraries '(#$guile-ac-d-bus
#$guile-packrat))) ;used by ac-d-bus
(setenv "DBUS_SESSION_BUS_ADDRESS" "unix:path=/var/run/jami/bus")
(set! %load-path
(append %load-path
(map (lambda (directory)
@ -200,7 +197,8 @@ (define marionette
(test-assert "service can be stopped"
(marionette-eval
'(begin
(use-modules (gnu build jami-service)
(use-modules (gnu build dbus-service)
(gnu build jami-service)
(gnu services herd)
(rnrs base))
(assert (jami-service-available?))