diff options
| author | Robert Hensing <robert@roberthensing.nl> | 2020-12-09 13:01:56 +0100 |
|---|---|---|
| committer | Robert Hensing <robert@roberthensing.nl> | 2020-12-09 13:24:48 +0100 |
| commit | a298710dd197273d45208fb572e328abad5ed6a9 (patch) | |
| tree | 67372496e616ec4fee280be27e7d7da2aec69915 /nixos/tests | |
| parent | 72a53016101c2cd8e43fe27cbd270aeaecfc6a41 (diff) | |
cassandra: Add passthru.tests
Diffstat (limited to 'nixos/tests')
| -rw-r--r-- | nixos/tests/all-tests.nix | 5 | ||||
| -rw-r--r-- | nixos/tests/cassandra.nix | 10 |
2 files changed, 10 insertions, 5 deletions
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 807a4bcdd9b8..33b03cd92848 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -49,7 +49,10 @@ in cadvisor = handleTestOn ["x86_64-linux"] ./cadvisor.nix {}; cage = handleTest ./cage.nix {}; cagebreak = handleTest ./cagebreak.nix {}; - cassandra = handleTest ./cassandra.nix {}; + cassandra_2_1 = handleTest ./cassandra.nix { testPackage = pkgs.cassandra_2_1; }; + cassandra_2_2 = handleTest ./cassandra.nix { testPackage = pkgs.cassandra_2_2; }; + cassandra_3_0 = handleTest ./cassandra.nix { testPackage = pkgs.cassandra_3_0; }; + cassandra_3_11 = handleTest ./cassandra.nix { testPackage = pkgs.cassandra_3_11; }; ceph-multi-node = handleTestOn ["x86_64-linux"] ./ceph-multi-node.nix {}; ceph-single-node = handleTestOn ["x86_64-linux"] ./ceph-single-node.nix {}; certmgr = handleTest ./certmgr.nix {}; diff --git a/nixos/tests/cassandra.nix b/nixos/tests/cassandra.nix index 05607956a9d6..bef3105f0a9e 100644 --- a/nixos/tests/cassandra.nix +++ b/nixos/tests/cassandra.nix @@ -1,7 +1,5 @@ -import ./make-test-python.nix ({ pkgs, lib, ... }: +import ./make-test-python.nix ({ pkgs, lib, testPackage ? pkgs.cassandra, ... }: let - # Change this to test a different version of Cassandra: - testPackage = pkgs.cassandra; clusterName = "NixOS Automated-Test Cluster"; testRemoteAuth = lib.versionAtLeast testPackage.version "3.11"; @@ -47,7 +45,7 @@ let }; in { - name = "cassandra"; + name = "cassandra-${testPackage.version}"; meta = { maintainers = with lib.maintainers; [ johnazoidberg ]; }; @@ -128,4 +126,8 @@ in "nodetool status -p ${jmxPortStr} --resolve-ip | egrep '^UN[[:space:]]+cass2'" ) ''; + + passthru = { + inherit testPackage; + }; }) |