summaryrefslogtreecommitdiff
path: root/gnu/tests
diff options
context:
space:
mode:
Diffstat (limited to 'gnu/tests')
-rw-r--r--gnu/tests/linux-modules.scm13
-rw-r--r--gnu/tests/web.scm14
2 files changed, 15 insertions, 12 deletions
diff --git a/gnu/tests/linux-modules.scm b/gnu/tests/linux-modules.scm
index 30d8eae03b..fc8945b77f 100644
--- a/gnu/tests/linux-modules.scm
+++ b/gnu/tests/linux-modules.scm
@@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2019 Jakob L. Kreuze <zerodaysfordays@sdf.org>
;;; Copyright © 2020 Danny Milosavljevic <dannym@scratchpost.org>
-;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re>
+;;; Copyright © 2020, 2021 Brice Waegeneire <brice@waegenei.re>
;;; Copyright © 2021 raid5atemyhomework <raid5atemyhomework@protonmail.com>
;;;
;;; This file is part of GNU Guix.
@@ -112,16 +112,13 @@ are loaded in memory."
"Run a test of an OS having MODULE-PACKAGES, which are loaded by creating a
service that extends LINUXL-LOADABLE-MODULE-SERVICE-TYPE. Then verify that
MODULE-NAMES are loaded in memory."
- (define module-installing-service-type
- (service-type
- (name 'module-installing-service)
- (extensions (list (service-extension linux-loadable-module-service-type
- (const module-packages))))
- (default-value #f)))
(run-loadable-kernel-modules-test-base
(operating-system
(inherit (simple-operating-system))
- (services (cons* (service module-installing-service-type)
+ (services (cons* (simple-service 'installing-module
+ linux-loadable-module-service-type
+ module-packages)
+ (service kernel-module-loader-service-type module-names)
(operating-system-user-services
(simple-operating-system)))))
module-names))
diff --git a/gnu/tests/web.scm b/gnu/tests/web.scm
index 61575f497d..518c9c1ff3 100644
--- a/gnu/tests/web.scm
+++ b/gnu/tests/web.scm
@@ -378,12 +378,14 @@ HTTP-PORT, along with php-fpm."
(define vm
(virtual-machine
(operating-system os)
- (port-forwardings '((8080 . 5000)))))
+ (port-forwardings '((8080 . 5000)))
+ (memory-size 1024)))
(define test
(with-imported-modules '((gnu build marionette))
#~(begin
(use-modules (srfi srfi-11) (srfi srfi-64)
+ (ice-9 match)
(gnu build marionette)
(web uri)
(web client)
@@ -412,9 +414,13 @@ HTTP-PORT, along with php-fpm."
200
(begin
(wait-for-tcp-port 5000 marionette)
- (let-values (((response text)
- (http-get "http://localhost:8080")))
- (response-code response))))
+ (#$retry-on-error
+ (lambda ()
+ (let-values (((response text)
+ (http-get "http://localhost:8080")))
+ (response-code response)))
+ #:times 10
+ #:delay 5)))
(test-end)
(exit (= (test-runner-fail-count (test-runner-current)) 0)))))