mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-20 20:39:04 +02:00
Merge pull request #174939 from FliegendeWurst/nixos-tests
nixos/tests: various fixes
This commit is contained in:
commit
c5d82eb1ab
|
@ -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(
|
||||
|
|
|
@ -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 = [ {
|
||||
|
|
|
@ -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"]
|
||||
|
|
|
@ -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";
|
||||
|
|
|
@ -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; {
|
||||
broken = stdenv.isDarwin;
|
||||
description = "Powerful, fast, and an easy to use search engine ";
|
||||
|
|
Loading…
Reference in a new issue