From 1c8b8bf83da030e6c205035c0c7bd13c9d4b2102 Mon Sep 17 00:00:00 2001
From: lassulus <git@lassul.us>
Date: Fri, 16 May 2025 19:23:04 +0200
Subject: [PATCH] clan_lib: move test_flake_caching into clan_lib flake folder

---
 pkgs/clan-cli/clan_lib/conftest.py                           | 3 +++
 .../test_flake_caching.py => clan_lib/flake/flake_test.py}   | 5 +++--
 pkgs/clan-cli/default.nix                                    | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/clan-cli/clan_lib/conftest.py
 rename pkgs/clan-cli/{clan_cli/tests/test_flake_caching.py => clan_lib/flake/flake_test.py} (98%)

diff --git a/pkgs/clan-cli/clan_lib/conftest.py b/pkgs/clan-cli/clan_lib/conftest.py
new file mode 100644
index 000000000..29bf40f42
--- /dev/null
+++ b/pkgs/clan-cli/clan_lib/conftest.py
@@ -0,0 +1,3 @@
+pytest_plugins = [
+    "clan_cli.tests.fixtures_flakes",
+]
diff --git a/pkgs/clan-cli/clan_cli/tests/test_flake_caching.py b/pkgs/clan-cli/clan_lib/flake/flake_test.py
similarity index 98%
rename from pkgs/clan-cli/clan_cli/tests/test_flake_caching.py
rename to pkgs/clan-cli/clan_lib/flake/flake_test.py
index 734153f44..bdeee2583 100644
--- a/pkgs/clan-cli/clan_cli/tests/test_flake_caching.py
+++ b/pkgs/clan-cli/clan_lib/flake/flake_test.py
@@ -2,6 +2,7 @@ import logging
 
 import pytest
 from clan_cli.tests.fixtures_flakes import ClanFlake
+
 from clan_lib.flake.flake import (
     Flake,
     FlakeCache,
@@ -332,10 +333,10 @@ def test_conditional_all_selector(flake: ClanFlake) -> None:
     assert isinstance(flake1._cache, FlakeCache)  # noqa: SLF001
     assert isinstance(flake2._cache, FlakeCache)  # noqa: SLF001
     log.info("First select")
-    res1 = flake1.select("inputs.*.{?clan,?missing}")
+    res1 = flake1.select("inputs.*.{?clan,?missing}.templates.*.*.description")
 
     log.info("Second (cached) select")
-    res2 = flake1.select("inputs.*.{?clan,?missing}")
+    res2 = flake1.select("inputs.*.{?clan,?missing}.templates.*.*.description")
 
     assert res1 == res2
     assert res1["clan-core"].get("clan") is not None
diff --git a/pkgs/clan-cli/default.nix b/pkgs/clan-cli/default.nix
index 0b80eaee2..76389259e 100644
--- a/pkgs/clan-cli/default.nix
+++ b/pkgs/clan-cli/default.nix
@@ -227,7 +227,7 @@ pythonRuntime.pkgs.buildPythonApplication {
             touch $out
           '';
     }
-    // {
+    // lib.optionalAttrs (!stdenv.isDarwin) {
       # disabled on macOS until we fix all remaining issues
       clan-lib-pytest =
         runCommand "clan-lib-pytest"