07/10: installer: Bypass connectivity check when /tmp/installer-assume-online exists.

[guix-commits]

civodul pushed a commit to branch wip-installer-test
in repository guix.

commit 889899e0afa00700d8f2223743f57b5ee42b44ab
Author: Ludovic Courtès <address@hidden>
AuthorDate: Wed Feb 19 12:10:47 2020 +0100

    installer: Bypass connectivity check when /tmp/installer-assume-online 
exists.
    
    This is useful for automated tests.
    
    * gnu/installer/newt/network.scm (wait-service-online)[online?]: New
    procedure.  Check for /tmp/installer-assume-online.
    Use it instead of 'connman-online?'.
---
 gnu/installer/newt/network.scm | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/gnu/installer/newt/network.scm b/gnu/installer/newt/network.scm
index 40d8581..461d5d9 100644
--- a/gnu/installer/newt/network.scm
+++ b/gnu/installer/newt/network.scm
@@ -1,6 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2018 Mathieu Othacehe <address@hidden>
-;;; Copyright © 2019 Ludovic Courtès <address@hidden>
+;;; Copyright © 2019, 2020 Ludovic Courtès <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -119,6 +119,10 @@ network devices were found. Do you want to continue 
anyway?"))
 (define (wait-service-online)
   "Display a newt scale until connman detects an Internet access. Do
 FULL-VALUE tentatives, spaced by 1 second."
+  (define (online?)
+    (or (connman-online?)
+        (file-exists? "/tmp/installer-assume-online")))
+
   (let* ((full-value 5))
     (run-scale-page
      #:title (G_ "Checking connectivity")
@@ -127,10 +131,10 @@ FULL-VALUE tentatives, spaced by 1 second."
      #:scale-update-proc
      (lambda (value)
        (sleep 1)
-       (if (connman-online?)
+       (if (online?)
            full-value
            (+ value 1))))
-    (unless (connman-online?)
+    (unless (online?)
       (run-error-page
        (G_ "The selected network does not provide access to the \
 Internet, please try again.")