[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: tests: install: Use the swap-space record.
From: |
guix-commits |
Subject: |
01/01: tests: install: Use the swap-space record. |
Date: |
Wed, 1 Dec 2021 13:22:37 -0500 (EST) |
mothacehe pushed a commit to branch core-updates-frozen-batched-changes
in repository guix.
commit 80c9870e8e9abb7bb4c7d3f7d331e6bb9bc6588e
Author: Mathieu Othacehe <othacehe@gnu.org>
AuthorDate: Wed Dec 1 19:20:24 2021 +0100
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.
---
gnu/tests/install.scm | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/gnu/tests/install.scm b/gnu/tests/install.scm
index a4b8b66..9602efe 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)))))