talexander/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

nixos/clickhouse: Migrate tests from handleTest to runTest

Browse Source
This commit is contained in:
Jonathan Davies 2025-06-15 12:35:59 +00:00
parent 4d60b8f537
commit 2723c76503
No known key found for this signature in database
6 changed files with 450 additions and 462 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/tests/all-tests.nix
View File

@ -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;

2
nixos/tests/clickhouse/base.nix
View File

@ -1,4 +1,3 @@
import ../make-test-python.nix (
{ pkgs, ... }:
{
name = "clickhouse";
@ -32,4 +31,3 @@ import ../make-test-python.nix (
)
'';
}
)

14
nixos/tests/clickhouse/default.nix
View File

@ -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;
}

2
nixos/tests/clickhouse/kafka.nix
View File

@ -1,4 +1,3 @@
import ../make-test-python.nix (
{ pkgs, ... }:
let
@ -171,4 +170,3 @@ import ../make-test-python.nix (
)
'';
}
)

2
nixos/tests/clickhouse/keeper.nix
View File

@ -1,4 +1,3 @@
import ../make-test-python.nix (
{ lib, pkgs, ... }:
rec {
name = "clickhouse-keeper";
@ -182,4 +181,3 @@ import ../make-test-python.nix (
)
'';
}
)

2
nixos/tests/clickhouse/s3.nix
View File

@ -1,4 +1,3 @@
import ../make-test-python.nix (
{ pkgs, ... }:
let
@ -120,4 +119,3 @@ import ../make-test-python.nix (
))
'';
}
)