From 113a6f9fe6603be7488c1c9a5bb4b1b7c5bb2f71 Mon Sep 17 00:00:00 2001
From: Vika <vika@fireburn.ru>
Date: Sun, 19 May 2024 01:27:56 +0300
Subject: Move NixOS test initialization to the package

This allows to initialize tests easier and not have them depend on the
flake itself. This might be useful if I ever have to build this
package without a flake.
---
 nixos-tests/distributed-test.nix    | 3 +--
 nixos-tests/postgres-smoke-test.nix | 3 +--
 nixos-tests/smoke-test.nix          | 5 +++--
 nixos-tests/webmention-test.nix     | 3 +--
 4 files changed, 6 insertions(+), 8 deletions(-)

(limited to 'nixos-tests')

diff --git a/nixos-tests/distributed-test.nix b/nixos-tests/distributed-test.nix
index 11c2dba..5e43bbf 100644
--- a/nixos-tests/distributed-test.nix
+++ b/nixos-tests/distributed-test.nix
@@ -1,9 +1,8 @@
 # This doesn't seem to work for some reason. I wonder why.
 # The VMs themselves don't want to launch properly.
-kittybox:
 { lib, system, ... }: let
   kittyboxModule = { config, pkgs, lib, ... }: {
-    imports = [ kittybox.nixosModules.default commonModule ];
+    imports = [ ../configuration.nix commonModule ];
 
     services.kittybox = {
       enable = true;
diff --git a/nixos-tests/postgres-smoke-test.nix b/nixos-tests/postgres-smoke-test.nix
index 51d53c7..59096d3 100644
--- a/nixos-tests/postgres-smoke-test.nix
+++ b/nixos-tests/postgres-smoke-test.nix
@@ -1,10 +1,9 @@
-kittybox:
 { lib, ... }: {
   name = "nixos-kittybox";
 
   nodes = {
     kittybox = { config, pkgs, lib, ... }: {
-      imports = [ kittybox.nixosModules.default ];
+      imports = [ ../configuration.nix ];
 
       services.postgresql = {
         enable = true;
diff --git a/nixos-tests/smoke-test.nix b/nixos-tests/smoke-test.nix
index b043a31..737dbab 100644
--- a/nixos-tests/smoke-test.nix
+++ b/nixos-tests/smoke-test.nix
@@ -1,11 +1,12 @@
-kittybox:
 { lib, ... }: {
   name = "nixos-kittybox";
 
   nodes = {
     kittybox = { config, pkgs, lib, ... }: {
-      imports = [ kittybox.nixosModules.default ];
+      imports = [ ../configuration.nix ];
 
+      # TODO: figure out if we can get rid of Postgres here
+      # even at the cost of Webmention functionality
       services.postgresql = {
         enable = true;
         ensureDatabases = ["kittybox"];
diff --git a/nixos-tests/webmention-test.nix b/nixos-tests/webmention-test.nix
index 45e3ff7..314b3d4 100644
--- a/nixos-tests/webmention-test.nix
+++ b/nixos-tests/webmention-test.nix
@@ -1,4 +1,3 @@
-kittybox:
 { lib, ... }: let
   hosts = ''
     192.168.2.101 kittybox.test
@@ -9,7 +8,7 @@ in {
 
   nodes = {
     kittybox = { config, pkgs, lib, ... }: {
-      imports = [ kittybox.nixosModules.default ];
+      imports = [ ../configuration.nix ];
 
       services.postgresql = {
         enable = true;
-- 
cgit 1.4.1