From 41a5f0a98a4970f27ff23914927aec33da949f2a Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Sun, 22 Jun 2025 21:41:50 -0500
Subject: [PATCH] tests/nix-gc: reorganize darwin and linux

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
---
 tests/modules/services/nix-gc-darwin/default.nix            | 6 ------
 .../services/{nix-gc-darwin => nix-gc/darwin}/basic.nix     | 0
 .../darwin}/darwin-nix-gc-interval-assertion.nix            | 0
 tests/modules/services/nix-gc/darwin/default.nix            | 4 ++++
 .../{nix-gc-darwin => nix-gc/darwin}/expected-agent.plist   | 0
 tests/modules/services/nix-gc/default.nix                   | 6 ++----
 tests/modules/services/nix-gc/{ => linux}/basic.nix         | 0
 tests/modules/services/nix-gc/linux/default.nix             | 3 +++
 tests/modules/services/nix-gc/{ => linux}/expected.service  | 0
 tests/modules/services/nix-gc/{ => linux}/expected.timer    | 0
 .../services/nix-gc/{ => linux}/nix-gc-script-expected      | 0
 11 files changed, 9 insertions(+), 10 deletions(-)
 delete mode 100644 tests/modules/services/nix-gc-darwin/default.nix
 rename tests/modules/services/{nix-gc-darwin => nix-gc/darwin}/basic.nix (100%)
 rename tests/modules/services/{nix-gc-darwin => nix-gc/darwin}/darwin-nix-gc-interval-assertion.nix (100%)
 create mode 100644 tests/modules/services/nix-gc/darwin/default.nix
 rename tests/modules/services/{nix-gc-darwin => nix-gc/darwin}/expected-agent.plist (100%)
 rename tests/modules/services/nix-gc/{ => linux}/basic.nix (100%)
 create mode 100644 tests/modules/services/nix-gc/linux/default.nix
 rename tests/modules/services/nix-gc/{ => linux}/expected.service (100%)
 rename tests/modules/services/nix-gc/{ => linux}/expected.timer (100%)
 rename tests/modules/services/nix-gc/{ => linux}/nix-gc-script-expected (100%)

diff --git a/tests/modules/services/nix-gc-darwin/default.nix b/tests/modules/services/nix-gc-darwin/default.nix
deleted file mode 100644
index c629b1d3..00000000
--- a/tests/modules/services/nix-gc-darwin/default.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ lib, pkgs, ... }:
-
-lib.optionalAttrs pkgs.stdenv.hostPlatform.isDarwin {
-  nix-gc = ./basic.nix;
-  darwin-nix-gc-interval-assertion = ./darwin-nix-gc-interval-assertion.nix;
-}
diff --git a/tests/modules/services/nix-gc-darwin/basic.nix b/tests/modules/services/nix-gc/darwin/basic.nix
similarity index 100%
rename from tests/modules/services/nix-gc-darwin/basic.nix
rename to tests/modules/services/nix-gc/darwin/basic.nix
diff --git a/tests/modules/services/nix-gc-darwin/darwin-nix-gc-interval-assertion.nix b/tests/modules/services/nix-gc/darwin/darwin-nix-gc-interval-assertion.nix
similarity index 100%
rename from tests/modules/services/nix-gc-darwin/darwin-nix-gc-interval-assertion.nix
rename to tests/modules/services/nix-gc/darwin/darwin-nix-gc-interval-assertion.nix
diff --git a/tests/modules/services/nix-gc/darwin/default.nix b/tests/modules/services/nix-gc/darwin/default.nix
new file mode 100644
index 00000000..070820b3
--- /dev/null
+++ b/tests/modules/services/nix-gc/darwin/default.nix
@@ -0,0 +1,4 @@
+{
+  nix-gc = ./basic.nix;
+  nix-gc-interval-assertion = ./darwin-nix-gc-interval-assertion.nix;
+}
diff --git a/tests/modules/services/nix-gc-darwin/expected-agent.plist b/tests/modules/services/nix-gc/darwin/expected-agent.plist
similarity index 100%
rename from tests/modules/services/nix-gc-darwin/expected-agent.plist
rename to tests/modules/services/nix-gc/darwin/expected-agent.plist
diff --git a/tests/modules/services/nix-gc/default.nix b/tests/modules/services/nix-gc/default.nix
index 5dbe2da9..4b1206a2 100644
--- a/tests/modules/services/nix-gc/default.nix
+++ b/tests/modules/services/nix-gc/default.nix
@@ -1,5 +1,3 @@
 { lib, pkgs, ... }:
-
-lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux {
-  nix-gc = ./basic.nix;
-}
+(lib.optionalAttrs pkgs.stdenv.hostPlatform.isDarwin (import ./darwin/default.nix))
+// (lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux (import ./linux/default.nix))
diff --git a/tests/modules/services/nix-gc/basic.nix b/tests/modules/services/nix-gc/linux/basic.nix
similarity index 100%
rename from tests/modules/services/nix-gc/basic.nix
rename to tests/modules/services/nix-gc/linux/basic.nix
diff --git a/tests/modules/services/nix-gc/linux/default.nix b/tests/modules/services/nix-gc/linux/default.nix
new file mode 100644
index 00000000..922d6a39
--- /dev/null
+++ b/tests/modules/services/nix-gc/linux/default.nix
@@ -0,0 +1,3 @@
+{
+  nix-gc = ./basic.nix;
+}
diff --git a/tests/modules/services/nix-gc/expected.service b/tests/modules/services/nix-gc/linux/expected.service
similarity index 100%
rename from tests/modules/services/nix-gc/expected.service
rename to tests/modules/services/nix-gc/linux/expected.service
diff --git a/tests/modules/services/nix-gc/expected.timer b/tests/modules/services/nix-gc/linux/expected.timer
similarity index 100%
rename from tests/modules/services/nix-gc/expected.timer
rename to tests/modules/services/nix-gc/linux/expected.timer
diff --git a/tests/modules/services/nix-gc/nix-gc-script-expected b/tests/modules/services/nix-gc/linux/nix-gc-script-expected
similarity index 100%
rename from tests/modules/services/nix-gc/nix-gc-script-expected
rename to tests/modules/services/nix-gc/linux/nix-gc-script-expected