From 8cb2a61de4e819e0584a955cea7768569649bb78 Mon Sep 17 00:00:00 2001 From: FliegendeWurst <2012gdwu+github@posteo.de> Date: Fri, 27 May 2022 11:50:22 +0200 Subject: [PATCH 1/3] nixos/tests/mjolnir: fix registration test --- nixos/tests/matrix/mjolnir.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/tests/matrix/mjolnir.nix b/nixos/tests/matrix/mjolnir.nix index 54094ab9d611..cb843e2e9e3e 100644 --- a/nixos/tests/matrix/mjolnir.nix +++ b/nixos/tests/matrix/mjolnir.nix @@ -43,6 +43,7 @@ import ../make-test-python.nix ( tls_certificate_path = "${cert}"; tls_private_key_path = "${key}"; enable_registration = true; + enable_registration_without_verification = true; registration_shared_secret = "supersecret-registration"; listeners = [ { From 19e4234f4cb2ac70d9e8edfb99603ea65ba362ab Mon Sep 17 00:00:00 2001 From: FliegendeWurst <2012gdwu+github@posteo.de> Date: Fri, 27 May 2022 13:59:04 +0200 Subject: [PATCH 2/3] nixos/tests/meilisearch: fix curl invocation Also replace the movies dataset with a direct download as it is not present in newer meilisearch versions. Link the NixOS test to the package. --- nixos/tests/meilisearch.nix | 11 ++++++----- pkgs/servers/search/meilisearch/default.nix | 4 ++++ 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/nixos/tests/meilisearch.nix b/nixos/tests/meilisearch.nix index 9f54aa97d6ad..05109a944bc4 100644 --- a/nixos/tests/meilisearch.nix +++ b/nixos/tests/meilisearch.nix @@ -5,9 +5,10 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: apiUrl = "http://${listenAddress}:${toString listenPort}"; uid = "movies"; indexJSON = pkgs.writeText "index.json" (builtins.toJSON { inherit uid; }); - moviesJSON = pkgs.runCommand "movies.json" {} '' - sed -n '1,5p;$p' ${pkgs.meilisearch.src}/datasets/movies/movies.json > $out - ''; + moviesJSON = pkgs.fetchurl { + url = "https://github.com/meilisearch/meilisearch/raw/v0.23.1/datasets/movies/movies.json"; + sha256 = "1r3srld63dpmg9yrmysm6xl175661j5cspi93mk5q2wf8xwn50c5"; + }; in { name = "meilisearch"; meta.maintainers = with lib.maintainers; [ Br1ght0ne ]; @@ -34,7 +35,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: with subtest("create index"): machine.succeed( - "curl -XPOST ${apiUrl}/indexes --data @${indexJSON}" + "curl -XPOST --header 'Content-Type: application/json' ${apiUrl}/indexes --data @${indexJSON}" ) indexes = json.loads(machine.succeed("curl ${apiUrl}/indexes")) assert len(indexes) == 1, "index wasn't created" @@ -42,7 +43,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: with subtest("add documents"): response = json.loads( machine.succeed( - "curl -XPOST ${apiUrl}/indexes/${uid}/documents --data @${moviesJSON}" + "curl -XPOST --header 'Content-Type: application/json' ${apiUrl}/indexes/${uid}/documents --data @${moviesJSON}" ) ) update_id = response["updateId"] diff --git a/pkgs/servers/search/meilisearch/default.nix b/pkgs/servers/search/meilisearch/default.nix index 9165a4713d4e..d188f926f9c2 100644 --- a/pkgs/servers/search/meilisearch/default.nix +++ b/pkgs/servers/search/meilisearch/default.nix @@ -5,6 +5,7 @@ , Security , DiskArbitration , Foundation +, nixosTests }: let version = "0.23.1"; @@ -25,6 +26,9 @@ rustPlatform.buildRustPackage { ]; cargoSha256 = "sha256-dz+1IQZRSeMEagI2dnOtR3A8prg4UZ2Om0pd1BUhuhE="; buildInputs = lib.optionals stdenv.isDarwin [ Security DiskArbitration Foundation ]; + passthru.tests = { + meilisearch = nixosTests.meilisearch; + }; meta = with lib; { description = "Powerful, fast, and an easy to use search engine "; homepage = "https://docs.meilisearch.com/"; From 9d2c8ba7e91aeaa398fa952f6ac6045f137a4674 Mon Sep 17 00:00:00 2001 From: FliegendeWurst <2012gdwu+github@posteo.de> Date: Fri, 27 May 2022 14:59:19 +0200 Subject: [PATCH 3/3] nixos/tests/gitolite: fix test timeout This prevents ssh from reading from stdin. Link the NixOS test to the package. --- nixos/tests/gitolite.nix | 2 +- pkgs/applications/version-management/gitolite/default.nix | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/nixos/tests/gitolite.nix b/nixos/tests/gitolite.nix index 128677cebde3..9b3af59e4fbd 100644 --- a/nixos/tests/gitolite.nix +++ b/nixos/tests/gitolite.nix @@ -107,7 +107,7 @@ in with subtest("gitolite server starts"): server.wait_for_unit("gitolite-init.service") server.wait_for_unit("sshd.service") - client.succeed("ssh gitolite@server info") + client.succeed("ssh -n gitolite@server info") with subtest("admin can clone and configure gitolite-admin.git"): client.succeed( diff --git a/pkgs/applications/version-management/gitolite/default.nix b/pkgs/applications/version-management/gitolite/default.nix index e9712a859d74..f5cf29fc4d0e 100644 --- a/pkgs/applications/version-management/gitolite/default.nix +++ b/pkgs/applications/version-management/gitolite/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, git, lib, makeWrapper, nettools, perl, perlPackages }: +{ stdenv, fetchFromGitHub, git, lib, makeWrapper, nettools, perl, perlPackages, nixosTests }: stdenv.mkDerivation rec { pname = "gitolite"; @@ -38,6 +38,10 @@ stdenv.mkDerivation rec { echo ${version} > $out/bin/VERSION ''; + passthru.tests = { + gitolite = nixosTests.gitolite; + }; + meta = with lib; { description = "Finely-grained git repository hosting"; homepage = "https://gitolite.com/gitolite/index.html";