summaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorMaxim Cournoyer <maxim.cournoyer@gmail.com>2023-05-25 09:46:23 -0400
committerMaxim Cournoyer <maxim.cournoyer@gmail.com>2023-05-25 10:17:32 -0400
commit99fc7e5dd3c9c92f9b6c2e51db9dc5b0481a56b2 (patch)
tree70e32dbabe469f35e8edd06aa3849a758fa05ecc /gnu
parentdb883ed5d7ca667cdeb062f1c3462b2f5662869c (diff)
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.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/tests/telephony.scm12
1 files changed, 5 insertions, 7 deletions
diff --git a/gnu/tests/telephony.scm b/gnu/tests/telephony.scm
index 5828784d27..442258dbc3 100644
--- a/gnu/tests/telephony.scm
+++ b/gnu/tests/telephony.scm
@@ -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 @@ jami account used as part of the jami configuration are left *unspecified*."
(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 @@ jami account used as part of the jami configuration are left *unspecified*."
(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 @@ jami account used as part of the jami configuration are left *unspecified*."
(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?))