Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion nixos/release.nix
Original file line number Diff line number Diff line change
Expand Up @@ -249,8 +249,9 @@ in rec {
# Run the tests for each platform. You can run a test by doing
# e.g. ‘nix-build -A tests.login.x86_64-linux’, or equivalently,
# ‘nix-build tests/login.nix -A result’.
tests.atd = callTest tests/atd.nix {};
tests.acme = callTest tests/acme.nix {};
tests.ammonite = callTest tests/ammonite.nix {};
tests.atd = callTest tests/atd.nix {};
tests.avahi = callTest tests/avahi.nix {};
tests.beegfs = callTest tests/beegfs.nix {};
tests.upnp = callTest tests/upnp.nix {};
Expand Down
2 changes: 2 additions & 0 deletions nixos/tests/acme.nix
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,6 @@ in import ./make-test.nix {
$client->waitForUnit("default.target");
$client->succeed('curl https://example.com/ | grep -qF "hello world"');
'';

meta.timeout = 120;
}
1 change: 1 addition & 0 deletions nixos/tests/ammonite.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import ./make-test.nix ({ pkgs, ...} : {
name = "ammonite";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ nequissimus ];
timeout = 40;
};

nodes = {
Expand Down
1 change: 1 addition & 0 deletions nixos/tests/atd.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import ./make-test.nix ({ pkgs, ... }:
name = "atd";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ bjornfor ];
timeout = 200;
};

machine =
Expand Down
5 changes: 4 additions & 1 deletion pkgs/development/tools/ammonite/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, makeWrapper, jre, gnused
{ stdenv, lib, fetchurl, makeWrapper, jre, gnused, nixosTests
, disableRemoteLogging ? true
}:

Expand Down Expand Up @@ -39,5 +39,8 @@ stdenv.mkDerivation rec {
license = lib.licenses.mit;
platforms = lib.platforms.all;
maintainers = [ lib.maintainers.nequissimus ];
tests = {
smoke-test = nixosTests.ammonite;
};
};
}
4 changes: 4 additions & 0 deletions pkgs/servers/http/nginx/generic.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{ stdenv, fetchurl, openssl, zlib, pcre, libxml2, libxslt
, gd, geoip
, nixosTests
, withDebug ? false
, withStream ? true
, withMail ? false
Expand Down Expand Up @@ -76,5 +77,8 @@ stdenv.mkDerivation {
license = licenses.bsd2;
platforms = platforms.all;
maintainers = with maintainers; [ thoughtpolice raskin fpletz ];
tests = {
acme = nixosTests.acme;
};
};
}
5 changes: 4 additions & 1 deletion pkgs/tools/admin/simp_le/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, python3Packages, bash }:
{ stdenv, python3Packages, bash, nixosTests }:

python3Packages.buildPythonApplication rec {
pname = "simp_le-client";
Expand Down Expand Up @@ -30,5 +30,8 @@ python3Packages.buildPythonApplication rec {
license = licenses.gpl3;
maintainers = with maintainers; [ gebner makefu ];
platforms = platforms.linux;
tests = {
acme = nixosTests.acme;
};
};
}
5 changes: 4 additions & 1 deletion pkgs/tools/system/at/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchpatch, bison, flex, pam
{ stdenv, fetchurl, fetchpatch, bison, flex, pam, nixosTests
, sendmailPath ? "/run/wrappers/bin/sendmail"
, atWrapperPath ? "/run/wrappers/bin/at"
}:
Expand Down Expand Up @@ -55,5 +55,8 @@ stdenv.mkDerivation rec {
license = stdenv.lib.licenses.gpl2Plus;
homepage = https://packages.qa.debian.org/at;
platforms = stdenv.lib.platforms.linux;
tests = {
nixos-module = nixosTests.atd;
};
};
}