From e9bde7692e7a0b6c87ea36200c3d196759959c31 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sun, 22 Jun 2025 21:35:26 -0500 Subject: [PATCH] tests/git-sync: reorganize darwin and linux Signed-off-by: Austin Horstman --- tests/modules/services/git-sync-darwin/default.nix | 5 ----- .../{git-sync-darwin => git-sync/darwin}/basic.nix | 0 tests/modules/services/git-sync/darwin/default.nix | 3 +++ .../darwin}/expected-agent.plist | 0 tests/modules/services/git-sync/default.nix | 7 ++----- tests/modules/services/git-sync/{ => linux}/basic.nix | 0 tests/modules/services/git-sync/linux/default.nix | 4 ++++ tests/modules/services/git-sync/{ => linux}/whitespace.nix | 0 8 files changed, 9 insertions(+), 10 deletions(-) delete mode 100644 tests/modules/services/git-sync-darwin/default.nix rename tests/modules/services/{git-sync-darwin => git-sync/darwin}/basic.nix (100%) create mode 100644 tests/modules/services/git-sync/darwin/default.nix rename tests/modules/services/{git-sync-darwin => git-sync/darwin}/expected-agent.plist (100%) rename tests/modules/services/git-sync/{ => linux}/basic.nix (100%) create mode 100644 tests/modules/services/git-sync/linux/default.nix rename tests/modules/services/git-sync/{ => linux}/whitespace.nix (100%) diff --git a/tests/modules/services/git-sync-darwin/default.nix b/tests/modules/services/git-sync-darwin/default.nix deleted file mode 100644 index eadd4defa..000000000 --- a/tests/modules/services/git-sync-darwin/default.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ lib, pkgs, ... }: - -lib.optionalAttrs pkgs.stdenv.hostPlatform.isDarwin { - git-sync = ./basic.nix; -} diff --git a/tests/modules/services/git-sync-darwin/basic.nix b/tests/modules/services/git-sync/darwin/basic.nix similarity index 100% rename from tests/modules/services/git-sync-darwin/basic.nix rename to tests/modules/services/git-sync/darwin/basic.nix diff --git a/tests/modules/services/git-sync/darwin/default.nix b/tests/modules/services/git-sync/darwin/default.nix new file mode 100644 index 000000000..cc4f9b38d --- /dev/null +++ b/tests/modules/services/git-sync/darwin/default.nix @@ -0,0 +1,3 @@ +{ + git-sync = ./basic.nix; +} diff --git a/tests/modules/services/git-sync-darwin/expected-agent.plist b/tests/modules/services/git-sync/darwin/expected-agent.plist similarity index 100% rename from tests/modules/services/git-sync-darwin/expected-agent.plist rename to tests/modules/services/git-sync/darwin/expected-agent.plist diff --git a/tests/modules/services/git-sync/default.nix b/tests/modules/services/git-sync/default.nix index bb39a12c2..4b1206a22 100644 --- a/tests/modules/services/git-sync/default.nix +++ b/tests/modules/services/git-sync/default.nix @@ -1,6 +1,3 @@ { lib, pkgs, ... }: - -lib.optionalAttrs pkgs.stdenv.hostPlatform.isLinux { - git-sync = ./basic.nix; - git-sync-with-whitespace = ./whitespace.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/git-sync/basic.nix b/tests/modules/services/git-sync/linux/basic.nix similarity index 100% rename from tests/modules/services/git-sync/basic.nix rename to tests/modules/services/git-sync/linux/basic.nix diff --git a/tests/modules/services/git-sync/linux/default.nix b/tests/modules/services/git-sync/linux/default.nix new file mode 100644 index 000000000..7a2000a3e --- /dev/null +++ b/tests/modules/services/git-sync/linux/default.nix @@ -0,0 +1,4 @@ +{ + git-sync = ./basic.nix; + git-sync-with-whitespace = ./whitespace.nix; +} diff --git a/tests/modules/services/git-sync/whitespace.nix b/tests/modules/services/git-sync/linux/whitespace.nix similarity index 100% rename from tests/modules/services/git-sync/whitespace.nix rename to tests/modules/services/git-sync/linux/whitespace.nix