diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-03-18 12:01:30 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-03-18 12:01:30 +0000 |
commit | a912b830519d782a31b9a529d784d63f1edb8e8d (patch) | |
tree | 9f9ebe682add4595c10dd7c17d52d9638175686f /nixos/tests | |
parent | c5d119b5866da3eac42c5a4931478dbea0ab88bf (diff) | |
parent | a5f8184fb816a4fd5ae87136838c9981e0d22c67 (diff) |
Merge master into staging-next
Diffstat (limited to 'nixos/tests')
-rw-r--r-- | nixos/tests/all-tests.nix | 1 | ||||
-rw-r--r-- | nixos/tests/netdata.nix | 2 | ||||
-rw-r--r-- | nixos/tests/solr.nix | 56 | ||||
-rw-r--r-- | nixos/tests/xfce.nix | 2 |
4 files changed, 2 insertions, 59 deletions
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 97be13f3bed0b..8386219f73d83 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -624,7 +624,6 @@ in { soapui = handleTest ./soapui.nix {}; sogo = handleTest ./sogo.nix {}; solanum = handleTest ./solanum.nix {}; - solr = handleTest ./solr.nix {}; sonarr = handleTest ./sonarr.nix {}; sourcehut = handleTest ./sourcehut.nix {}; spacecookie = handleTest ./spacecookie.nix {}; diff --git a/nixos/tests/netdata.nix b/nixos/tests/netdata.nix index 0f26630da9d4b..aea67c29d0d4b 100644 --- a/nixos/tests/netdata.nix +++ b/nixos/tests/netdata.nix @@ -3,7 +3,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "netdata"; meta = with pkgs.lib.maintainers; { - maintainers = [ cransom ]; + maintainers = [ cransom raitobezarius ]; }; nodes = { diff --git a/nixos/tests/solr.nix b/nixos/tests/solr.nix deleted file mode 100644 index 33afe9d788f78..0000000000000 --- a/nixos/tests/solr.nix +++ /dev/null @@ -1,56 +0,0 @@ -import ./make-test-python.nix ({ pkgs, ... }: - -{ - name = "solr"; - meta.maintainers = [ pkgs.lib.maintainers.aanderse ]; - - nodes.machine = - { config, pkgs, ... }: - { - # Ensure the virtual machine has enough memory for Solr to avoid the following error: - # - # OpenJDK 64-Bit Server VM warning: - # INFO: os::commit_memory(0x00000000e8000000, 402653184, 0) - # failed; error='Cannot allocate memory' (errno=12) - # - # There is insufficient memory for the Java Runtime Environment to continue. - # Native memory allocation (mmap) failed to map 402653184 bytes for committing reserved memory. - virtualisation.memorySize = 2000; - - services.solr.enable = true; - }; - - testScript = '' - start_all() - - machine.wait_for_unit("solr.service") - machine.wait_for_open_port(8983) - machine.succeed("curl --fail http://localhost:8983/solr/") - - # adapted from pkgs.solr/examples/films/README.txt - machine.succeed("sudo -u solr solr create -c films") - assert '"status":0' in machine.succeed( - """ - curl http://localhost:8983/solr/films/schema -X POST -H 'Content-type:application/json' --data-binary '{ - "add-field" : { - "name":"name", - "type":"text_general", - "multiValued":false, - "stored":true - }, - "add-field" : { - "name":"initial_release_date", - "type":"pdate", - "stored":true - } - }' - """ - ) - machine.succeed( - "sudo -u solr post -c films ${pkgs.solr}/example/films/films.json" - ) - assert '"name":"Batman Begins"' in machine.succeed( - "curl http://localhost:8983/solr/films/query?q=name:batman" - ) - ''; -}) diff --git a/nixos/tests/xfce.nix b/nixos/tests/xfce.nix index 31f00f77c40d4..3758ccbccf425 100644 --- a/nixos/tests/xfce.nix +++ b/nixos/tests/xfce.nix @@ -26,7 +26,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { }; testScript = { nodes, ... }: let - user = nodes.machine.config.users.users.alice; + user = nodes.machine.users.users.alice; in '' machine.wait_for_x() machine.wait_for_file("${user.home}/.Xauthority") |