summary refs log tree commit diff
diff options
context:
space:
mode:
authorMathieu Othacehe <othacehe@gnu.org>2021-12-01 19:20:24 +0100
committerMathieu Othacehe <othacehe@gnu.org>2021-12-01 19:23:12 +0100
commit05c747ea6bdffd6b9c425c7f8b3d3860ae3d7861 (patch)
treeeb2aacdd49189d976142c0f6705fdc684d3052dd
parent68d090002a1a5623494006fca3e2c2c97d3ff676 (diff)
downloadguix-05c747ea6bdffd6b9c425c7f8b3d3860ae3d7861.tar.gz
tests: install: Use the swap-space record.
This fixes the following error:

In gnu/services/base.scm:
  2228:56  4 (_ #<<uuid> type: dce bv: #vu8(17 17 17 17 34 34 51 51 …>)
In gnu/build/file-systems.scm:
   239:13  3 (swap-space->flags-bit-mask #<<uuid> type: dce bv: #vu8…>)
In ice-9/boot-9.scm:
  1685:16  2 (raise-exception _ #:continuable? _)
  1685:16  1 (raise-exception _ #:continuable? _)
  1685:16  0 (raise-exception _ #:continuable? _)

ice-9/boot-9.scm:1685:16: In procedure raise-exception:
In procedure swap-space-priority: Wrong type argument: #<<uuid> type: dce bv: #vu8(17 17 17 17 34 34 51 51 68 68 18 52 86 120 154 188)>

* gnu/tests/install.scm (installation-target-os-for-gui-tests): Use the
swap-space record.
-rw-r--r--gnu/tests/install.scm9
1 files changed, 6 insertions, 3 deletions
diff --git a/gnu/tests/install.scm b/gnu/tests/install.scm
index a4b8b6655c..9602efebe7 100644
--- a/gnu/tests/install.scm
+++ b/gnu/tests/install.scm
@@ -1679,9 +1679,12 @@ build (current-guix) and then store a couple of full system images.")
     ;; encryption support.  The installer produces a UUID for the partition;
     ;; this "UUID" is explicitly set in 'gui-test-program' to the value shown
     ;; below.
-    (swap-devices (if encrypted?
-                      '()
-                      (list (uuid "11111111-2222-3333-4444-123456789abc"))))
+    (swap-devices
+     (if encrypted?
+         '()
+         (list
+          (swap-space
+           (target (uuid "11111111-2222-3333-4444-123456789abc"))))))
     (services (cons (service dhcp-client-service-type)
                     (operating-system-user-services %minimal-os-on-vda)))))