nixos/clickhouse: Migrate tests from handleTest to runTest

nixos/tests/all-tests.nix

@@ -306,7 +306,7 @@ in
   cinnamon-wayland = runTest ./cinnamon-wayland.nix;
   cjdns = runTest ./cjdns.nix;
   clatd = runTest ./clatd.nix;
-  clickhouse = handleTest ./clickhouse { };
+  clickhouse = import ./clickhouse { inherit runTest; };
   cloud-init = handleTest ./cloud-init.nix { };
   cloud-init-hostname = handleTest ./cloud-init-hostname.nix { };
   cloudlog = runTest ./cloudlog.nix;

nixos/tests/clickhouse/base.nix

@@ -1,6 +1,5 @@
-import ../make-test-python.nix (
-  { pkgs, ... }:
-  {
+{ pkgs, ... }:
+{
   name = "clickhouse";
   meta.maintainers = with pkgs.lib.maintainers; [ jpds ];
 
@@ -31,5 +30,4 @@ import ../make-test-python.nix (
           "cat ${selectQuery} | clickhouse-client | grep foo"
       )
     '';
-  }
-)
+}

nixos/tests/clickhouse/default.nix

@@ -1,12 +1,8 @@
-{
-  system ? builtins.currentSystem,
-  config ? { },
-  pkgs ? import ../../.. { inherit system config; },
-}:
+{ runTest }:
 
 {
-  base = import ./base.nix { inherit system pkgs; };
-  kafka = import ./kafka.nix { inherit system pkgs; };
-  keeper = import ./keeper.nix { inherit system pkgs; };
-  s3 = import ./s3.nix { inherit system pkgs; };
+  base = runTest ./base.nix;
+  kafka = runTest ./kafka.nix;
+  keeper = runTest ./keeper.nix;
+  s3 = runTest ./s3.nix;
 }

nixos/tests/clickhouse/kafka.nix

@@ -1,7 +1,6 @@
-import ../make-test-python.nix (
-  { pkgs, ... }:
+{ pkgs, ... }:
 
-  let
+let
   kafkaNamedCollectionConfig = ''
     <clickhouse>
       <named_collections>
@@ -26,8 +25,8 @@ import ../make-test-python.nix (
   '';
 
   kafkaNamedCollection = pkgs.writeText "kafka.xml" kafkaNamedCollectionConfig;
-  in
-  {
+in
+{
   name = "clickhouse-kafka";
   meta.maintainers = with pkgs.lib.maintainers; [ jpds ];
 
@@ -170,5 +169,4 @@ import ../make-test-python.nix (
         "cat ${selectQuery} | clickhouse-client | grep 74"
       )
     '';
-  }
-)
+}

nixos/tests/clickhouse/keeper.nix

@@ -1,6 +1,5 @@
-import ../make-test-python.nix (
-  { lib, pkgs, ... }:
-  rec {
+{ lib, pkgs, ... }:
+rec {
   name = "clickhouse-keeper";
   meta.maintainers = with pkgs.lib.maintainers; [ jpds ];
 
@@ -181,5 +180,4 @@ import ../make-test-python.nix (
           "cat ${selectCountQuery} | clickhouse-client | grep 100000000"
         )
     '';
-  }
-)
+}

nixos/tests/clickhouse/s3.nix

@@ -1,7 +1,6 @@
-import ../make-test-python.nix (
-  { pkgs, ... }:
+{ pkgs, ... }:
 
-  let
+let
   s3 = {
     bucket = "clickhouse-bucket";
     accessKey = "BKIKJAA5BMMU2RHO6IBB";
@@ -38,8 +37,8 @@ import ../make-test-python.nix (
       </storage_configuration>
     </clickhouse>
   '';
-  in
-  {
+in
+{
   name = "clickhouse-s3";
   meta.maintainers = with pkgs.lib.maintainers; [ jpds ];
 
@@ -119,5 +118,4 @@ import ../make-test-python.nix (
         "mc ls minio/${s3.bucket}",
       ))
     '';
-  }
-)
+}