From c4bb36fa33abbc519717f08d2f35fcf824b43ed3 Mon Sep 17 00:00:00 2001
From: b12f <git@benjaminbaedorf.eu>
Date: Thu, 16 Jan 2025 09:37:30 +0100
Subject: [PATCH] chore: fix merge
---
tests/keycloak.nix | 8 ++------
tests/support/client.nix | 4 ++--
tests/support/mail-server.nix | 1 +
3 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/tests/keycloak.nix b/tests/keycloak.nix
index 7e490b5..5cce920 100644
--- a/tests/keycloak.nix
+++ b/tests/keycloak.nix
@@ -51,12 +51,6 @@ in
};
};
-# <<<<<<< HEAD
-# testScript = { ... }: ''
-# def puppeteer_run(cmd):
-# client.succeed(f'puppeteer-run \'{cmd}\' ')
-#
-# =======
testScript =
{ nodes, ... }:
let
@@ -69,6 +63,8 @@ in
wmClass = su "${gdbus} ${gseval} global.display.focus_window.wm_class";
in
''
+ def puppeteer_run(cmd):
+ client.succeed(f'puppeteer-run \'{cmd}\' ')
start_all()
acme_server.wait_for_unit("system.slice")
diff --git a/tests/support/client.nix b/tests/support/client.nix
index 3c35a99..2a50b5c 100644
--- a/tests/support/client.nix
+++ b/tests/support/client.nix
@@ -28,11 +28,11 @@ in
pkgs.alacritty
];
- services.getty.autologinUser = config.pub-solar-os.authentication.username;
+ services.getty.autologinUser = "b12f";
virtualisation.qemu.options = [ "-vga std" ];
- home-manager.users.${config.pub-solar-os.authentication.username} = {
+ home-manager.users.b12f = {
programs.bash.profileExtra = ''
[ "$(tty)" = "/dev/tty1" ] && exec systemd-cat --identifier=sway ${pkgs.sway}/bin/sway
'';
diff --git a/tests/support/mail-server.nix b/tests/support/mail-server.nix
index 27e6d7b..98afdd5 100644
--- a/tests/support/mail-server.nix
+++ b/tests/support/mail-server.nix
@@ -6,6 +6,7 @@
imports = [
flake.self.nixosModules.home-manager
flake.self.nixosModules.core
+ flake.self.nixosModules.backups
flake.self.nixosModules.mail
flake.inputs.simple-nixos-mailserver.nixosModule
./global.nix