Merge branch 'master' into core-updates

 Conflicts:
	gnu/local.mk
	gnu/packages/algebra.scm
	gnu/packages/bioinformatics.scm
	gnu/packages/curl.scm
	gnu/packages/docbook.scm
	gnu/packages/emacs-xyz.scm
	gnu/packages/maths.scm
	gnu/packages/plotutils.scm
	gnu/packages/python-web.scm
	gnu/packages/python-xyz.scm
	gnu/packages/radio.scm
	gnu/packages/readline.scm
	gnu/packages/tls.scm
	gnu/packages/xml.scm
	gnu/packages/xorg.scm

1 files changed, 10 insertions, 4 deletions

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)))))