nixosTests.ceph-single-node-bluestore: handleTest -> runTest

nixos/tests/all-tests.nix

@@ -297,10 +297,10 @@ in
   centrifugo = runTest ./centrifugo.nix;
   ceph-multi-node = runTestOn [ "aarch64-linux" "x86_64-linux" ] ./ceph-multi-node.nix;
   ceph-single-node = runTestOn [ "aarch64-linux" "x86_64-linux" ] ./ceph-single-node.nix;
-  ceph-single-node-bluestore = handleTestOn [
+  ceph-single-node-bluestore = runTestOn [
     "aarch64-linux"
     "x86_64-linux"
-  ] ./ceph-single-node-bluestore.nix { };
+  ] ./ceph-single-node-bluestore.nix;
   ceph-single-node-bluestore-dmcrypt = handleTestOn [
     "aarch64-linux"
     "x86_64-linux"

nixos/tests/ceph-single-node-bluestore.nix

@@ -1,5 +1,4 @@
-import ./make-test-python.nix (
-  { pkgs, lib, ... }:
+{ lib, ... }:
 
 let
   cfg = {
@@ -38,11 +37,10 @@ import ./make-test-python.nix (
 
   generateHost =
     {
-        pkgs,
       cephConfig,
       networkConfig,
-        ...
     }:
+    { pkgs, ... }:
     {
       virtualisation = {
         emptyDiskImages = [
@@ -69,7 +67,7 @@ import ./make-test-python.nix (
 
   networkMonA = {
     dhcpcd.enable = false;
-      interfaces.eth1.ipv4.addresses = pkgs.lib.mkOverride 0 [
+    interfaces.eth1.ipv4.addresses = lib.mkOverride 0 [
       {
         address = cfg.monA.ip;
         prefixLength = 24;
@@ -101,9 +99,7 @@ import ./make-test-python.nix (
   # https://docs.ceph.com/docs/master/install/manual-deployment/
   # For other ways to deploy a ceph cluster, look at the documentation at
   # https://docs.ceph.com/docs/master/
-    testscript =
-      { ... }:
-      ''
+  testScript = ''
     start_all()
 
     monA.wait_for_unit("network.target")
@@ -219,18 +215,16 @@ import ./make-test-python.nix (
 in
 {
   name = "basic-single-node-ceph-cluster-bluestore";
-    meta = with pkgs.lib.maintainers; {
+  meta = with lib.maintainers; {
     maintainers = [ lukegb ];
   };
 
   nodes = {
     monA = generateHost {
-        pkgs = pkgs;
       cephConfig = cephConfigMonA;
       networkConfig = networkMonA;
     };
   };
 
-    testScript = testscript;
+  inherit testScript;
 }
-)