Skip to content

Commit 0731489

Browse files
committed
all tests: added meta.maintainers section
1 parent 7e021a0 commit 0731489

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+242
-92
lines changed

nixos/lib/testing.nix

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -122,12 +122,16 @@ rec {
122122
${lib.optionalString (builtins.length vms == 1) "--set USE_SERIAL 1"}
123123
''; # "
124124

125-
test = runTests driver;
125+
passMeta = drv: drv // lib.optionalAttrs (t ? meta) {
126+
meta = (drv.meta or {}) // t.meta;
127+
};
126128

127-
report = releaseTools.gcovReport { coverageRuns = [ test ]; };
128-
129-
in (if makeCoverageReport then report else test) // { inherit nodes driver test; };
129+
test = passMeta (runTests driver);
130+
report = passMeta (releaseTools.gcovReport { coverageRuns = [ test ]; });
130131

132+
in (if makeCoverageReport then report else test) // {
133+
inherit nodes driver test;
134+
};
131135

132136
runInMachine =
133137
{ drv

nixos/release.nix

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,5 @@ in rec {
330330
services.postgresql.package = pkgs.postgresql93;
331331
environment.systemPackages = [ pkgs.php ];
332332
});
333-
334333
};
335-
336334
}

nixos/tests/avahi.nix

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
# Test whether `avahi-daemon' and `libnss-mdns' work as expected.
2-
3-
import ./make-test.nix {
2+
import ./make-test.nix ({ pkgs, ... } : {
43
name = "avahi";
4+
meta = with pkgs.stdenv.lib.maintainers; {
5+
maintainers = [ eelco chaoflow wizeman ];
6+
};
57

68
nodes = {
79
one =
@@ -52,4 +54,4 @@ import ./make-test.nix {
5254
$two->succeed("getent hosts one.local >&2");
5355
$two->succeed("getent hosts two.local >&2");
5456
'';
55-
}
57+
})

nixos/tests/bittorrent.nix

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ in
2424

2525
{
2626
name = "bittorrent";
27+
meta = with pkgs.stdenv.lib.maintainers; {
28+
maintainers = [ iElectric eelco chaoflow rob wkennington ];
29+
};
2730

2831
nodes =
2932
{ tracker =

nixos/tests/blivet.nix

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
import ./make-test.nix ({ pkgs, ... }: with pkgs.pythonPackages; rec {
22
name = "blivet";
3+
meta = with pkgs.stdenv.lib.maintainers; {
4+
maintainers = [ aszlig ];
5+
};
36

47
machine = {
58
environment.systemPackages = [ pkgs.python blivet mock ];

nixos/tests/cadvisor.nix

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
1-
import ./make-test.nix {
1+
import ./make-test.nix ({ pkgs, ... } : {
22
name = "cadvisor";
3+
meta = with pkgs.stdenv.lib.maintainers; {
4+
maintainers = [ offline ];
5+
};
36

47
nodes = {
58
machine = { config, pkgs, ... }: {
@@ -27,4 +30,4 @@ import ./make-test.nix {
2730
$influxdb->waitForUnit("cadvisor.service");
2831
$influxdb->succeed("curl http://localhost:8080/containers/");
2932
'';
30-
}
33+
})

nixos/tests/check-filesystems.nix

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ with import ../lib/build-vms.nix { inherit nixos nixpkgs system; };
77

88
rec {
99
name = "check-filesystems";
10+
meta = with pkgs.stdenv.lib.maintainers; {
11+
maintainers = [ eelco chaoflow ];
12+
};
1013

1114
nodes = {
1215
share = {pkgs, config, ...}: {

nixos/tests/chromium.nix

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ import ./make-test.nix (
88
, ...
99
}: rec {
1010
name = "chromium";
11+
meta = with pkgs.stdenv.lib.maintainers; {
12+
maintainers = [ aszlig ];
13+
};
1114

1215
enableOCR = true;
1316

nixos/tests/cjdns.nix

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,11 @@ let
2222

2323
in
2424

25-
import ./make-test.nix {
25+
import ./make-test.nix ({ pkgs, ...} : {
2626
name = "cjdns";
27+
meta = with pkgs.stdenv.lib.maintainers; {
28+
maintainers = [ emery ];
29+
};
2730

2831
nodes = rec
2932
{ # Alice finds peers over over ETHInterface.
@@ -119,4 +122,4 @@ import ./make-test.nix {
119122
120123
$bob->succeed("curl --fail -g http://[$aliceIp6]");
121124
'';
122-
}
125+
})

nixos/tests/containers.nix

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
# Test for NixOS' container support.
22

3-
import ./make-test.nix {
3+
import ./make-test.nix ({ pkgs, ...} : {
44
name = "containers";
5+
meta = with pkgs.stdenv.lib.maintainers; {
6+
maintainers = [ aristid aszlig eelco chaoflow ];
7+
};
58

69
machine =
710
{ config, pkgs, ... }:
@@ -113,4 +116,4 @@ import ./make-test.nix {
113116
$machine->fail("nixos-container destroy webserver");
114117
'';
115118

116-
}
119+
})

0 commit comments

Comments
 (0)