all tests: added meta.maintainers section

This commit is contained in:
Joachim Schiele 2015-07-12 12:09:40 +02:00
parent 7e021a0fd6
commit 0731489953
56 changed files with 242 additions and 92 deletions

View file

@ -122,12 +122,16 @@ rec {
${lib.optionalString (builtins.length vms == 1) "--set USE_SERIAL 1"} ${lib.optionalString (builtins.length vms == 1) "--set USE_SERIAL 1"}
''; # " ''; # "
test = runTests driver; passMeta = drv: drv // lib.optionalAttrs (t ? meta) {
meta = (drv.meta or {}) // t.meta;
};
report = releaseTools.gcovReport { coverageRuns = [ test ]; }; test = passMeta (runTests driver);
report = passMeta (releaseTools.gcovReport { coverageRuns = [ test ]; });
in (if makeCoverageReport then report else test) // { inherit nodes driver test; };
in (if makeCoverageReport then report else test) // {
inherit nodes driver test;
};
runInMachine = runInMachine =
{ drv { drv

View file

@ -330,7 +330,5 @@ in rec {
services.postgresql.package = pkgs.postgresql93; services.postgresql.package = pkgs.postgresql93;
environment.systemPackages = [ pkgs.php ]; environment.systemPackages = [ pkgs.php ];
}); });
}; };
} }

View file

@ -1,7 +1,9 @@
# Test whether `avahi-daemon' and `libnss-mdns' work as expected. # Test whether `avahi-daemon' and `libnss-mdns' work as expected.
import ./make-test.nix ({ pkgs, ... } : {
import ./make-test.nix {
name = "avahi"; name = "avahi";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ eelco chaoflow wizeman ];
};
nodes = { nodes = {
one = one =
@ -52,4 +54,4 @@ import ./make-test.nix {
$two->succeed("getent hosts one.local >&2"); $two->succeed("getent hosts one.local >&2");
$two->succeed("getent hosts two.local >&2"); $two->succeed("getent hosts two.local >&2");
''; '';
} })

View file

@ -24,6 +24,9 @@ in
{ {
name = "bittorrent"; name = "bittorrent";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ iElectric eelco chaoflow rob wkennington ];
};
nodes = nodes =
{ tracker = { tracker =

View file

@ -1,5 +1,8 @@
import ./make-test.nix ({ pkgs, ... }: with pkgs.pythonPackages; rec { import ./make-test.nix ({ pkgs, ... }: with pkgs.pythonPackages; rec {
name = "blivet"; name = "blivet";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ aszlig ];
};
machine = { machine = {
environment.systemPackages = [ pkgs.python blivet mock ]; environment.systemPackages = [ pkgs.python blivet mock ];

View file

@ -1,5 +1,8 @@
import ./make-test.nix { import ./make-test.nix ({ pkgs, ... } : {
name = "cadvisor"; name = "cadvisor";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ offline ];
};
nodes = { nodes = {
machine = { config, pkgs, ... }: { machine = { config, pkgs, ... }: {
@ -27,4 +30,4 @@ import ./make-test.nix {
$influxdb->waitForUnit("cadvisor.service"); $influxdb->waitForUnit("cadvisor.service");
$influxdb->succeed("curl http://localhost:8080/containers/"); $influxdb->succeed("curl http://localhost:8080/containers/");
''; '';
} })

View file

@ -7,6 +7,9 @@ with import ../lib/build-vms.nix { inherit nixos nixpkgs system; };
rec { rec {
name = "check-filesystems"; name = "check-filesystems";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ eelco chaoflow ];
};
nodes = { nodes = {
share = {pkgs, config, ...}: { share = {pkgs, config, ...}: {

View file

@ -8,6 +8,9 @@ import ./make-test.nix (
, ... , ...
}: rec { }: rec {
name = "chromium"; name = "chromium";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ aszlig ];
};
enableOCR = true; enableOCR = true;

View file

@ -22,8 +22,11 @@ let
in in
import ./make-test.nix { import ./make-test.nix ({ pkgs, ...} : {
name = "cjdns"; name = "cjdns";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ emery ];
};
nodes = rec nodes = rec
{ # Alice finds peers over over ETHInterface. { # Alice finds peers over over ETHInterface.
@ -119,4 +122,4 @@ import ./make-test.nix {
$bob->succeed("curl --fail -g http://[$aliceIp6]"); $bob->succeed("curl --fail -g http://[$aliceIp6]");
''; '';
} })

View file

@ -1,7 +1,10 @@
# Test for NixOS' container support. # Test for NixOS' container support.
import ./make-test.nix { import ./make-test.nix ({ pkgs, ...} : {
name = "containers"; name = "containers";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ aristid aszlig eelco chaoflow ];
};
machine = machine =
{ config, pkgs, ... }: { config, pkgs, ... }:
@ -113,4 +116,4 @@ import ./make-test.nix {
$machine->fail("nixos-container destroy webserver"); $machine->fail("nixos-container destroy webserver");
''; '';
} })

View file

@ -1,7 +1,10 @@
# This test runs docker-registry and check if it works # This test runs docker-registry and check if it works
import ./make-test.nix { import ./make-test.nix ({ pkgs, ...} : {
name = "docker-registry"; name = "docker-registry";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ offline ];
};
nodes = { nodes = {
registry = { config, pkgs, ... }: { registry = { config, pkgs, ... }: {
@ -37,4 +40,4 @@ import ./make-test.nix {
$client2->succeed("docker pull registry:8080/scratch"); $client2->succeed("docker pull registry:8080/scratch");
$client2->succeed("docker images | grep scratch"); $client2->succeed("docker images | grep scratch");
''; '';
} })

View file

@ -1,7 +1,10 @@
# This test runs docker and checks if simple container starts # This test runs docker and checks if simple container starts
import ./make-test.nix { import ./make-test.nix ({ pkgs, ...} : {
name = "docker"; name = "docker";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ offline ];
};
nodes = { nodes = {
docker = docker =
@ -20,5 +23,4 @@ import ./make-test.nix {
$docker->succeed("docker ps | grep sleeping"); $docker->succeed("docker ps | grep sleeping");
$docker->succeed("docker stop sleeping"); $docker->succeed("docker stop sleeping");
''; '';
})
}

View file

@ -1,7 +1,10 @@
# This test runs etcd as single node, multy node and using discovery # This test runs etcd as single node, multy node and using discovery
import ./make-test.nix { import ./make-test.nix ({ pkgs, ... } : {
name = "etcd"; name = "etcd";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ offline ];
};
nodes = { nodes = {
simple = simple =
@ -105,4 +108,4 @@ import ./make-test.nix {
$discovery2->waitUntilSucceeds("etcdctl get /foo/bar | grep 'Hello world'"); $discovery2->waitUntilSucceeds("etcdctl get /foo/bar | grep 'Hello world'");
}; };
''; '';
} })

View file

@ -1,5 +1,8 @@
import ./make-test.nix ({ pkgs, ... }: { import ./make-test.nix ({ pkgs, ... }: {
name = "firefox"; name = "firefox";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ eelco chaoflow shlevy ];
};
machine = machine =
{ config, pkgs, ... }: { config, pkgs, ... }:

View file

@ -1,7 +1,10 @@
# Test the firewall module. # Test the firewall module.
import ./make-test.nix { import ./make-test.nix ( { pkgs, ... } : {
name = "firewall"; name = "firewall";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ eelco chaoflow ];
};
nodes = nodes =
{ walled = { walled =
@ -44,5 +47,4 @@ import ./make-test.nix {
$walled->stopJob("firewall"); $walled->stopJob("firewall");
$attacker->succeed("curl -v http://walled/ >&2"); $attacker->succeed("curl -v http://walled/ >&2");
''; '';
})
}

View file

@ -1,5 +1,8 @@
import ./make-test.nix rec { import ./make-test.nix ({ pkgs, ...} : rec {
name = "simple"; name = "simple";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ offline ];
};
nodes = { nodes = {
node1 = node1 =
@ -70,4 +73,4 @@ import ./make-test.nix rec {
$node1->succeed("fleetctl stop hello.service"); $node1->succeed("fleetctl stop hello.service");
$node1->succeed("fleetctl destroy hello.service"); $node1->succeed("fleetctl destroy hello.service");
''; '';
} })

View file

@ -1,7 +1,10 @@
# This test runs gitlab and checks if it works # This test runs gitlab and checks if it works
import ./make-test.nix { import ./make-test.nix ({ pkgs, ...} : {
name = "gitlab"; name = "gitlab";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ iElectric offline ];
};
nodes = { nodes = {
gitlab = { config, pkgs, ... }: { gitlab = { config, pkgs, ... }: {
@ -18,4 +21,4 @@ import ./make-test.nix {
$gitlab->waitForUnit("gitlab-sidekiq.service"); $gitlab->waitForUnit("gitlab-sidekiq.service");
$gitlab->waitUntilSucceeds("curl http://localhost:8080/users/sign_in"); $gitlab->waitUntilSucceeds("curl http://localhost:8080/users/sign_in");
''; '';
} })

View file

@ -1,5 +1,8 @@
import ./make-test.nix { import ./make-test.nix ({ pkgs, ...} : {
name = "gnome3"; name = "gnome3";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ iElectric eelco chaoflow lethalman ];
};
machine = machine =
{ config, pkgs, ... }: { config, pkgs, ... }:
@ -28,5 +31,4 @@ import ./make-test.nix {
$machine->sleep(20); $machine->sleep(20);
$machine->screenshot("screen"); $machine->screenshot("screen");
''; '';
})
}

View file

@ -1,5 +1,8 @@
import ./make-test.nix { import ./make-test.nix ({ pkgs, ...} : {
name = "i3wm"; name = "i3wm";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ aszlig ];
};
machine = { lib, pkgs, ... }: { machine = { lib, pkgs, ... }: {
imports = [ ./common/x11.nix ./common/user-account.nix ]; imports = [ ./common/x11.nix ./common/user-account.nix ];
@ -25,4 +28,4 @@ import ./make-test.nix {
$machine->sleep(1); $machine->sleep(1);
$machine->screenshot("terminal"); $machine->screenshot("terminal");
''; '';
} })

View file

@ -1,7 +1,10 @@
# This test runs influxdb and checks if influxdb is up and running # This test runs influxdb and checks if influxdb is up and running
import ./make-test.nix { import ./make-test.nix ({ pkgs, ...} : {
name = "influxdb"; name = "influxdb";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ chaoflow offline ];
};
nodes = { nodes = {
one = { config, pkgs, ... }: { one = { config, pkgs, ... }: {
@ -33,4 +36,4 @@ import ./make-test.nix {
--data-urlencode 'q=select * from foo limit 1' | grep 6666 --data-urlencode 'q=select * from foo limit 1' | grep 6666
~); ~);
''; '';
} })

View file

@ -149,12 +149,15 @@ let
makeInstallerTest = name: makeInstallerTest = name:
{ createPartitions, preBootCommands ? "", extraConfig ? "" { createPartitions, preBootCommands ? "", extraConfig ? ""
, grubVersion ? 2, grubDevice ? "/dev/vda" , grubVersion ? 2, grubDevice ? "/dev/vda"
, grubIdentifier ? "uuid", enableOCR ? false , grubIdentifier ? "uuid", enableOCR ? false, meta ? {}
}: }:
makeTest { makeTest {
inherit enableOCR; inherit enableOCR;
name = "installer-" + name; name = "installer-" + name;
meta = with pkgs.stdenv.lib.maintainers; {
# put global maintainers here, individuals go into makeInstallerTest fkt call
maintainers = [ wkennington ] ++ (meta.maintainers or []);
};
nodes = { nodes = {
# The configuration of the machine used to run "nixos-install". It # The configuration of the machine used to run "nixos-install". It

View file

@ -1,8 +1,11 @@
# Test of IPv6 functionality in NixOS, including whether router # Test of IPv6 functionality in NixOS, including whether router
# solicication/advertisement using radvd works. # solicication/advertisement using radvd works.
import ./make-test.nix { import ./make-test.nix ({ pkgs, ...} : {
name = "ipv6"; name = "ipv6";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ eelco chaoflow ];
};
nodes = nodes =
{ client = { config, pkgs, ... }: { }; { client = { config, pkgs, ... }: { };
@ -73,5 +76,4 @@ import ./make-test.nix {
# TODO: test reachability of a machine on another network. # TODO: test reachability of a machine on another network.
''; '';
})
}

View file

@ -3,8 +3,11 @@
# 2. jenkins user can be extended on both master and slave # 2. jenkins user can be extended on both master and slave
# 3. jenkins service not started on slave node # 3. jenkins service not started on slave node
import ./make-test.nix { import ./make-test.nix ({ pkgs, ...} : {
name = "jenkins"; name = "jenkins";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ bjornfor coconnor iElectric eelco chaoflow ];
};
nodes = { nodes = {
@ -41,4 +44,4 @@ import ./make-test.nix {
$slave->mustFail("systemctl is-enabled jenkins.service"); $slave->mustFail("systemctl is-enabled jenkins.service");
''; '';
} })

View file

@ -1,5 +1,8 @@
import ./make-test.nix ({ pkgs, ... }: { import ./make-test.nix ({ pkgs, ... }: {
name = "kde4"; name = "kde4";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ iElectric eelco chaoflow ];
};
machine = machine =
{ config, pkgs, ... }: { config, pkgs, ... }:

View file

@ -1,7 +1,10 @@
# Test whether fast reboots via kexec work. # Test whether fast reboots via kexec work.
import ./make-test.nix { import ./make-test.nix ({ pkgs, ...} : {
name = "kexec"; name = "kexec";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ eelco chaoflow ];
};
machine = { config, pkgs, ... }: machine = { config, pkgs, ... }:
{ virtualisation.vlans = [ ]; }; { virtualisation.vlans = [ ]; };
@ -13,5 +16,4 @@ import ./make-test.nix {
$machine->{connected} = 0; $machine->{connected} = 0;
$machine->waitForUnit("multi-user.target"); $machine->waitForUnit("multi-user.target");
''; '';
})
}

View file

@ -1,7 +1,10 @@
# This test runs two node kubernetes cluster and checks if simple redis pod works # This test runs two node kubernetes cluster and checks if simple redis pod works
import ./make-test.nix rec { import ./make-test.nix ({ pkgs, ...} : rec {
name = "kubernetes"; name = "kubernetes";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ offline ];
};
redisMaster = builtins.toFile "redis-master-pod.yaml" '' redisMaster = builtins.toFile "redis-master-pod.yaml" ''
id: redis-master-pod id: redis-master-pod
@ -176,4 +179,4 @@ import ./make-test.nix rec {
} }
''; '';
} })

View file

@ -1,5 +1,8 @@
import ./make-test.nix { import ./make-test.nix ({ pkgs, ...} : {
name = "lightdm"; name = "lightdm";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ aszlig ];
};
machine = { lib, ... }: { machine = { lib, ... }: {
imports = [ ./common/user-account.nix ]; imports = [ ./common/user-account.nix ];
@ -22,4 +25,4 @@ import ./make-test.nix {
$machine->waitForText(qr/^\d{2}(?::\d{2}){2} (?:AM|PM)$/m); $machine->waitForText(qr/^\d{2}(?::\d{2}){2} (?:AM|PM)$/m);
$machine->screenshot("session"); $machine->screenshot("session");
''; '';
} })

View file

@ -2,6 +2,9 @@ import ./make-test.nix ({ pkgs, latestKernel ? false, ... }:
{ {
name = "login"; name = "login";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ eelco chaoflow ];
};
machine = machine =
{ config, pkgs, lib, ... }: { config, pkgs, lib, ... }:

View file

@ -1,8 +1,11 @@
# This test runs logstash and checks if messages flows and # This test runs logstash and checks if messages flows and
# elasticsearch is started. # elasticsearch is started.
import ./make-test.nix { import ./make-test.nix ({ pkgs, ...} : {
name = "logstash"; name = "logstash";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ eelco chaoflow offline ];
};
nodes = { nodes = {
one = one =
@ -37,4 +40,4 @@ import ./make-test.nix {
$one->fail("journalctl -n 20 _SYSTEMD_UNIT=logstash.service | grep dragons"); $one->fail("journalctl -n 20 _SYSTEMD_UNIT=logstash.service | grep dragons");
$one->waitUntilSucceeds("curl -s http://127.0.0.1:9200/_status?pretty=true | grep logstash"); $one->waitUntilSucceeds("curl -s http://127.0.0.1:9200/_status?pretty=true | grep logstash");
''; '';
} })

View file

@ -1,5 +1,8 @@
import ./make-test.nix { import ./make-test.nix ({ pkgs, ...} : {
name = "simple"; name = "simple";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ offline ];
};
machine = { config, pkgs, ... }: { machine = { config, pkgs, ... }: {
services.zookeeper.enable = true; services.zookeeper.enable = true;
@ -26,4 +29,4 @@ import ./make-test.nix {
$machine->waitForUnit("mesos-master.service"); $machine->waitForUnit("mesos-master.service");
$machine->waitForUnit("mesos-slave.service"); $machine->waitForUnit("mesos-slave.service");
''; '';
} })

View file

@ -1,7 +1,10 @@
# Miscellaneous small tests that don't warrant their own VM run. # Miscellaneous small tests that don't warrant their own VM run.
import ./make-test.nix { import ./make-test.nix ({ pkgs, ...} : {
name = "misc"; name = "misc";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ eelco chaoflow ];
};
machine = machine =
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
@ -107,5 +110,4 @@ import ./make-test.nix {
$machine->succeed("nix-store -qR /run/current-system | grep nixos-"); $machine->succeed("nix-store -qR /run/current-system | grep nixos-");
}; };
''; '';
})
}

View file

@ -1,7 +1,10 @@
# Simple example to showcase distributed tests using NixOS VMs. # Simple example to showcase distributed tests using NixOS VMs.
import ./make-test.nix { import ./make-test.nix ({ pkgs, ...} : {
name = "mpich"; name = "mpich";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ eelco chaoflow ];
};
nodes = { nodes = {
master = master =
@ -35,4 +38,4 @@ import ./make-test.nix {
$master->succeed("mpiexec -n 2 ./example >&2"); $master->succeed("mpiexec -n 2 ./example >&2");
''; '';
} })

View file

@ -1,4 +1,4 @@
import ./make-test.nix ( import ./make-test.nix ({ pkgs, ...} :
let let
client = { config, pkgs, ... }: { client = { config, pkgs, ... }: {
@ -8,6 +8,9 @@ let
in in
{ {
name = "mumble"; name = "mumble";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ thoughtpolice eelco chaoflow ];
};
nodes = { nodes = {
server = { config, pkgs, ... }: { server = { config, pkgs, ... }: {

View file

@ -1,8 +1,11 @@
# This test runs basic munin setup with node and cron job running on the same # This test runs basic munin setup with node and cron job running on the same
# machine. # machine.
import ./make-test.nix { import ./make-test.nix ({ pkgs, ...} : {
name = "munin"; name = "munin";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ iElectric eelco chaoflow ];
};
nodes = { nodes = {
one = one =
@ -29,4 +32,4 @@ import ./make-test.nix {
$one->waitForFile("/var/lib/munin/one/one-uptime-uptime-g.rrd"); $one->waitForFile("/var/lib/munin/one/one-uptime-uptime-g.rrd");
$one->waitForFile("/var/www/munin/one/index.html"); $one->waitForFile("/var/www/munin/one/index.html");
''; '';
} })

View file

@ -1,4 +1,4 @@
import ./make-test.nix ( import ./make-test.nix ({ pkgs, ...} :
let let
replicateUser = "replicate"; replicateUser = "replicate";
@ -7,6 +7,9 @@ in
{ {
name = "mysql-replication"; name = "mysql-replication";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ eelco chaoflow shlevy ];
};
nodes = { nodes = {
master = master =

View file

@ -1,5 +1,8 @@
import ./make-test.nix { import ./make-test.nix ({ pkgs, ...} : {
name = "mysql"; name = "mysql";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ eelco chaoflow shlevy ];
};
nodes = { nodes = {
master = master =
@ -20,4 +23,4 @@ import ./make-test.nix {
$master->sleep(10); # Hopefully this is long enough!! $master->sleep(10); # Hopefully this is long enough!!
$master->succeed("echo 'use testdb; select * from tests' | mysql -u root -N | grep 4"); $master->succeed("echo 'use testdb; select * from tests' | mysql -u root -N | grep 4");
''; '';
} })

View file

@ -3,12 +3,15 @@
# client on the inside network, a server on the outside network, and a # client on the inside network, a server on the outside network, and a
# router connected to both that performs Network Address Translation # router connected to both that performs Network Address Translation
# for the client. # for the client.
import ./make-test.nix ({ withFirewall, ... }: import ./make-test.nix ({ pkgs, withFirewall, ... }:
let let
unit = if withFirewall then "firewall" else "nat"; unit = if withFirewall then "firewall" else "nat";
in in
{ {
name = "nat${if withFirewall then "WithFirewall" else "Standalone"}"; name = "nat${if withFirewall then "WithFirewall" else "Standalone"}";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ eelco chaoflow rob wkennington ];
};
nodes = nodes =
{ client = { client =

View file

@ -10,8 +10,11 @@ let default-config = {
virtualisation.memorySize = 128; virtualisation.memorySize = 128;
}; };
in import ./make-test.nix { in import ./make-test.nix ({ pkgs, ...} : {
name = "networking-proxy"; name = "networking-proxy";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ ];
};
nodes = { nodes = {
# no proxy # no proxy
@ -105,5 +108,4 @@ in import ./make-test.nix {
$machine4->mustSucceed("su - alice -c 'env | grep -i ftp_proxy | grep 000'"); $machine4->mustSucceed("su - alice -c 'env | grep -i ftp_proxy | grep 000'");
$machine4->mustSucceed("su - alice -c 'env | grep -i no_proxy | grep 131415'"); $machine4->mustSucceed("su - alice -c 'env | grep -i no_proxy | grep 131415'");
''; '';
})
}

View file

@ -1,4 +1,4 @@
import ./make-test.nix ({ networkd, test, ... }: import ./make-test.nix ({ pkgs, networkd, test, ... }:
let let
router = { config, pkgs, ... }: router = { config, pkgs, ... }:
with pkgs.lib; with pkgs.lib;
@ -389,4 +389,7 @@ import ./make-test.nix ({ networkd, test, ... }:
case = testCases.${test}; case = testCases.${test};
in case // { in case // {
name = "${case.name}-Networking-${if networkd then "Networkd" else "Scripted"}"; name = "${case.name}-Networking-${if networkd then "Networkd" else "Scripted"}";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ wkennington ];
};
}) })

View file

@ -1,4 +1,4 @@
import ./make-test.nix ({ version ? 4, ... }: import ./make-test.nix ({ pkgs, version ? 4, ... }:
let let
@ -18,6 +18,9 @@ in
{ {
name = "nfs"; name = "nfs";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ eelco chaoflow wkennington ];
};
nodes = nodes =
{ client1 = client; { client1 = client;
@ -83,5 +86,4 @@ in
my $duration = time - $t1; my $duration = time - $t1;
die "shutdown took too long ($duration seconds)" if $duration > 30; die "shutdown took too long ($duration seconds)" if $duration > 30;
''; '';
}) })

View file

@ -5,8 +5,11 @@ let
# for a host utility with IPv6 support # for a host utility with IPv6 support
environment.systemPackages = [ pkgs.bind ]; environment.systemPackages = [ pkgs.bind ];
}; };
in import ./make-test.nix { in import ./make-test.nix ({ pkgs, ...} : {
name = "nsd"; name = "nsd";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ aszlig ];
};
nodes = { nodes = {
clientv4 = { lib, nodes, ... }: { clientv4 = { lib, nodes, ... }: {
@ -80,4 +83,4 @@ in import ./make-test.nix {
}; };
} }
''; '';
} })

View file

@ -17,6 +17,9 @@ let
in { in {
name = "openssh"; name = "openssh";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ aszlig eelco chaoflow ];
};
nodes = { nodes = {

View file

@ -1,5 +1,8 @@
import ./make-test.nix { import ./make-test.nix ({ pkgs, ...} : {
name = "panamax"; name = "panamax";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ offline ];
};
machine = { config, pkgs, ... }: { machine = { config, pkgs, ... }: {
services.panamax.enable = true; services.panamax.enable = true;
@ -15,4 +18,4 @@ import ./make-test.nix {
$machine->succeed("curl --fail http://localhost:8888/ > /dev/null"); $machine->succeed("curl --fail http://localhost:8888/ > /dev/null");
$machine->shutdown; $machine->shutdown;
''; '';
} })

View file

@ -1,7 +1,10 @@
# This test runs peerflix and checks if peerflix starts # This test runs peerflix and checks if peerflix starts
import ./make-test.nix { import ./make-test.nix ({ pkgs, ...} : {
name = "peerflix"; name = "peerflix";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ offline ];
};
nodes = { nodes = {
peerflix = peerflix =
@ -17,5 +20,4 @@ import ./make-test.nix {
$peerflix->waitForUnit("peerflix.service"); $peerflix->waitForUnit("peerflix.service");
$peerflix->waitUntilSucceeds("curl localhost:9000"); $peerflix->waitUntilSucceeds("curl localhost:9000");
''; '';
})
}

View file

@ -1,5 +1,8 @@
import ./make-test.nix ({ pkgs, ... }: { import ./make-test.nix ({ pkgs, ... }: {
name = "phabricator"; name = "phabricator";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ chaoflow ];
};
nodes = { nodes = {
storage = storage =

View file

@ -2,6 +2,9 @@
import ./make-test.nix ({pkgs, ... }: { import ./make-test.nix ({pkgs, ... }: {
name = "printing"; name = "printing";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ iElectric eelco chaoflow jgeerds vcunat ];
};
nodes = { nodes = {
@ -90,5 +93,4 @@ import ./make-test.nix ({pkgs, ... }: {
}; };
} }
''; '';
}) })

View file

@ -1,4 +1,4 @@
import ./make-test.nix ( import ./make-test.nix ({ pkgs, ...} :
let let
@ -15,6 +15,9 @@ in
{ {
name = "proxy"; name = "proxy";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ eelco chaoflow ];
};
nodes = nodes =
{ proxy = { proxy =
@ -89,5 +92,4 @@ in
$backend2->unblock; $backend2->unblock;
$client->succeed("curl --fail http://proxy/"); $client->succeed("curl --fail http://proxy/");
''; '';
}) })

View file

@ -1,4 +1,4 @@
import ./make-test.nix ( import ./make-test.nix ({ pkgs, ...} :
let let
@ -14,6 +14,9 @@ in
rec { rec {
name = "quake3"; name = "quake3";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ iElectric eelco chaoflow ];
};
# TODO: lcov doesn't work atm # TODO: lcov doesn't work atm
#makeCoverageReport = true; #makeCoverageReport = true;

View file

@ -2,6 +2,9 @@
import ./make-test.nix ({ pkgs, ... }: { import ./make-test.nix ({ pkgs, ... }: {
name = "rabbitmq"; name = "rabbitmq";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ eelco chaoflow offline ];
};
nodes = { nodes = {
one = { config, pkgs, ... }: { one = { config, pkgs, ... }: {

View file

@ -1,5 +1,8 @@
import ./make-test.nix { import ./make-test.nix ({ pkgs, ...} : {
name = "simple"; name = "simple";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ eelco ];
};
machine = { config, pkgs, ... }: { }; machine = { config, pkgs, ... }: { };
@ -9,4 +12,4 @@ import ./make-test.nix {
$machine->waitForUnit("multi-user.target"); $machine->waitForUnit("multi-user.target");
$machine->shutdown; $machine->shutdown;
''; '';
} })

View file

@ -1,4 +1,4 @@
import ./make-test.nix ( import ./make-test.nix ({ pkgs, ...} :
let let
@ -33,6 +33,9 @@ in
{ {
name = "subversion"; name = "subversion";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ eelco chaoflow ];
};
nodes = nodes =
{ webserver = { webserver =

View file

@ -1,5 +1,8 @@
import ./make-test.nix { import ./make-test.nix ({ pkgs, ...} : {
name = "tomcat"; name = "tomcat";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ eelco chaoflow ];
};
nodes = { nodes = {
server = server =
@ -25,5 +28,4 @@ import ./make-test.nix {
$client->succeed("curl --fail http://server/examples/servlets/servlet/HelloWorldExample"); $client->succeed("curl --fail http://server/examples/servlets/servlet/HelloWorldExample");
$client->succeed("curl --fail http://server/examples/jsp/jsp2/simpletag/hello.jsp"); $client->succeed("curl --fail http://server/examples/jsp/jsp2/simpletag/hello.jsp");
''; '';
})
}

View file

@ -1,5 +1,8 @@
import ./make-test.nix ({ pkgs, ... }: { import ./make-test.nix ({ pkgs, ... }: {
name = "trac"; name = "trac";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ eelco chaoflow ];
};
nodes = { nodes = {
storage = storage =

View file

@ -11,6 +11,9 @@ in
{ {
name = "udisks2"; name = "udisks2";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ eelco chaoflow ];
};
machine = machine =
{ config, pkgs, ... }: { config, pkgs, ... }:

View file

@ -298,6 +298,9 @@ import ./make-test.nix ({ pkgs, ... }: with pkgs.lib; let
in { in {
name = "virtualbox"; name = "virtualbox";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ aszlig wkennington ];
};
machine = { pkgs, lib, config, ... }: { machine = { pkgs, lib, config, ... }: {
imports = let imports = let

View file

@ -1,5 +1,8 @@
import ./make-test.nix { import ./make-test.nix ({ pkgs, ...} : {
name = "xfce"; name = "xfce";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ eelco chaoflow shlevy ];
};
machine = machine =
{ config, pkgs, ... }: { config, pkgs, ... }:
@ -28,5 +31,4 @@ import ./make-test.nix {
$machine->sleep(10); $machine->sleep(10);
$machine->screenshot("screen"); $machine->screenshot("screen");
''; '';
})
}