me
/
guix
Archived
1
0
Fork 0
Code

tests: Fix the Jami service system tests. 

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.
master
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 ;;; 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. ;;; This file is part of GNU Guix.
;;; ;;;
@ -152,13 +152,9 @@ jami account used as part of the jami configuration are left *unspecified*."
(with-imported-modules (source-module-closure (with-imported-modules (source-module-closure
'((gnu build marionette))) '((gnu build marionette)))
#~(begin #~(begin
(use-modules (rnrs base) (use-modules (srfi srfi-64)
(srfi srfi-11)
(srfi srfi-64)
(gnu build marionette)) (gnu build marionette))
(setenv "DBUS_SESSION_BUS_ADDRESS" "unix:path=/var/run/jami/bus")
(define marionette (define marionette
(make-marionette (list #$vm))) (make-marionette (list #$vm)))
@ -171,6 +167,7 @@ jami account used as part of the jami configuration are left *unspecified*."
(marionette-eval (marionette-eval
'(let ((libraries '(#$guile-ac-d-bus '(let ((libraries '(#$guile-ac-d-bus
#$guile-packrat))) ;used by ac-d-bus #$guile-packrat))) ;used by ac-d-bus
(setenv "DBUS_SESSION_BUS_ADDRESS" "unix:path=/var/run/jami/bus")
(set! %load-path (set! %load-path
(append %load-path (append %load-path
(map (lambda (directory) (map (lambda (directory)
@ -200,7 +197,8 @@ jami account used as part of the jami configuration are left *unspecified*."
(test-assert "service can be stopped" (test-assert "service can be stopped"
(marionette-eval (marionette-eval
'(begin '(begin
(use-modules (gnu build jami-service) (use-modules (gnu build dbus-service)
(gnu build jami-service)
(gnu services herd) (gnu services herd)
(rnrs base)) (rnrs base))
(assert (jami-service-available?)) (assert (jami-service-available?))