From 38d86e4725804449cce4a38e3fc964ff5edc3f88 Mon Sep 17 00:00:00 2001
From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com>
Date: Sat, 5 Apr 2025 18:35:52 +0200
Subject: [PATCH] nixosTests.calibre-server: migrate to runTest

Part of #386873
---
 nixos/tests/all-tests.nix      | 2 +-
 nixos/tests/calibre-server.nix | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 2dfcfabcd256..3898413d2da1 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -275,7 +275,7 @@ in
   cage = handleTest ./cage.nix { };
   cagebreak = handleTest ./cagebreak.nix { };
   calibre-web = runTest ./calibre-web.nix;
-  calibre-server = handleTest ./calibre-server.nix { };
+  calibre-server = import ./calibre-server.nix { inherit pkgs runTest; };
   canaille = handleTest ./canaille.nix { };
   castopod = handleTest ./castopod.nix { };
   cassandra_3_0 = handleTest ./cassandra.nix { testPackage = pkgs.cassandra_3_0; };
diff --git a/nixos/tests/calibre-server.nix b/nixos/tests/calibre-server.nix
index 2a04dd8cfba4..059058778526 100644
--- a/nixos/tests/calibre-server.nix
+++ b/nixos/tests/calibre-server.nix
@@ -1,11 +1,10 @@
 {
-  system ? builtins.currentSystem,
-  config ? { },
-  pkgs ? import ../.. { inherit system config; },
+  pkgs,
+  runTest,
+  ...
 }:
 
 let
-  inherit (import ../lib/testing-python.nix { inherit system pkgs; }) makeTest;
   inherit (pkgs.lib)
     concatStringsSep
     maintainers
@@ -74,7 +73,7 @@ let
 in
 mapAttrs (
   test: testConfig:
-  (makeTest (
+  (runTest (
     let
       nodeName = testConfig.nodeName or test;
       calibreConfig = {