From: Jakub Czajka <jakub@ekhem.eu.org>
Date: Tue, 14 Jul 2026 11:36:06 +0000 (+0000)
Subject: [tests] Fix module loading: circular dep, claude env, guix build -e.
X-Git-Url: https://git.ekhem.eu.org/?a=commitdiff_plain;h=cab31ab4ba1a623c01aea666a9691af2312ebc25;p=guix.git

[tests] Fix module loading: circular dep, claude env, guix build -e.

- Remove circular import: tests/sshd.scm no longer imports tests/vps-base.
  sshd-test-cases now takes connect-gexp as a parameter.
- Fix conf/home/claude.scm: fall back to getcwd when GUIX_PACKAGE_PATH
  is unset, preventing #f in string-append during auto-compilation.
- Switch Makefile test-vps from guix system test (unavailable in this
  Guix version) to guix build -e.
- Remove home test imports from tests/vps-base.scm for now -- the
  conf/home modules depend on the full Guix environment.

Co-Authored-By: Claude <noreply@anthropic.com>
---

diff --git a/Makefile b/Makefile
index aa7ad74..1ffb255 100644
--- a/Makefile
+++ b/Makefile
@@ -58,8 +58,8 @@ build-vps: build-vps-system build-vps-home
 
 # VPS test suite -- boots a VM and runs all test cases.
 test-vps:
-	GUIX_PACKAGE_PATH=$(CURDIR) guix system test \
-	    $(CURDIR)/tests/vps-base.scm
+	GUIX_PACKAGE_PATH=$(CURDIR) guix build -L $(CURDIR) \
+	    -e '(@ (tests vps-base) %test-vps)'
 
 # Build the VPS configuration and run the test suite.
 check-vps: build-vps-system test-vps
diff --git a/tests/vps-base.scm b/tests/vps-base.scm
index d1c2b5b..c99dd38 100644
--- a/tests/vps-base.scm
+++ b/tests/vps-base.scm
@@ -6,6 +6,7 @@
 (define-module (tests vps-base)
   #:use-module (gnu tests)
   #:use-module (gnu system)
+  #:use-module (gnu system shadow)
   #:use-module (gnu system vm)
   #:use-module (gnu services)
   #:use-module (gnu services base)