nixos/release: Use callSubTests for subtests

lol

Should clean up a lot of these redundant lines for various sub-tests.

Note that the tests.boot* are now called tests.boot.boot*, but otherwise
all the test attribute names should stay the same.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @edolstra
Cc: @wkennington
Cc: @bobvanderlinden

aszlig 10 years ago 7eea91fb 2f2536b9

+6 -41

2 changed files

expand all

unified split

nixos

release-combined.nix

release.nix

+1 -1

nixos/release-combined.nix

··· 63 63 (all nixos.tests.installer.btrfsSimple) 64 64 (all nixos.tests.installer.btrfsSubvols) 65 65 (all nixos.tests.installer.btrfsSubvolDefault) 66 - (all nixos.tests.bootBiosCdrom) 66 + (all nixos.tests.boot.bootBiosCdrom) 67 67 (all nixos.tests.ipv6) 68 68 (all nixos.tests.kde4) 69 69 #(all nixos.tests.lightdm)

+5 -40

nixos/release.nix

··· 233 233 tests.avahi = callTest tests/avahi.nix {}; 234 234 tests.bittorrent = callTest tests/bittorrent.nix {}; 235 235 tests.blivet = callTest tests/blivet.nix {}; 236 + tests.boot = callSubTests tests/boot.nix {}; 236 237 tests.cadvisor = hydraJob (import tests/cadvisor.nix { system = "x86_64-linux"; }); 237 238 tests.chromium = callTest tests/chromium.nix {}; 238 239 tests.cjdns = callTest tests/cjdns.nix {}; ··· 250 251 tests.gnome3-gdm = callTest tests/gnome3-gdm.nix {}; 251 252 tests.grsecurity = callTest tests/grsecurity.nix {}; 252 253 tests.i3wm = callTest tests/i3wm.nix {}; 253 - tests.installer.grub1 = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).grub1.test); 254 - tests.installer.lvm = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).lvm.test); 255 - tests.installer.luksroot = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).luksroot.test); 256 - tests.installer.separateBoot = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).separateBoot.test); 257 - tests.installer.separateBootFat = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).separateBootFat.test); 258 - tests.installer.simple = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).simple.test); 259 - tests.installer.simpleLabels = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).simpleLabels.test); 260 - tests.installer.simpleProvided = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).simpleProvided.test); 261 - tests.installer.swraid = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).swraid.test); 262 - tests.installer.btrfsSimple = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).btrfsSimple.test); 263 - tests.installer.btrfsSubvols = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).btrfsSubvols.test); 264 - tests.installer.btrfsSubvolDefault = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).btrfsSubvolDefault.test); 254 + tests.installer = callSubTests tests/installer.nix {}; 265 255 tests.influxdb = callTest tests/influxdb.nix {}; 266 256 tests.ipv6 = callTest tests/ipv6.nix {}; 267 257 tests.jenkins = callTest tests/jenkins.nix {}; ··· 280 270 tests.mysqlReplication = callTest tests/mysql-replication.nix {}; 281 271 tests.nat.firewall = callTest tests/nat.nix { withFirewall = true; }; 282 272 tests.nat.standalone = callTest tests/nat.nix { withFirewall = false; }; 283 - tests.networking.networkd.loopback = callTest tests/networking.nix { networkd = true; test = "loopback"; }; 284 - tests.networking.networkd.static = callTest tests/networking.nix { networkd = true; test = "static"; }; 285 - tests.networking.networkd.dhcpSimple = callTest tests/networking.nix { networkd = true; test = "dhcpSimple"; }; 286 - tests.networking.networkd.dhcpOneIf = callTest tests/networking.nix { networkd = true; test = "dhcpOneIf"; }; 287 - tests.networking.networkd.bond = callTest tests/networking.nix { networkd = true; test = "bond"; }; 288 - tests.networking.networkd.bridge = callTest tests/networking.nix { networkd = true; test = "bridge"; }; 289 - tests.networking.networkd.macvlan = callTest tests/networking.nix { networkd = true; test = "macvlan"; }; 290 - tests.networking.networkd.sit = callTest tests/networking.nix { networkd = true; test = "sit"; }; 291 - tests.networking.networkd.vlan = callTest tests/networking.nix { networkd = true; test = "vlan"; }; 292 - tests.networking.scripted.loopback = callTest tests/networking.nix { networkd = false; test = "loopback"; }; 293 - tests.networking.scripted.static = callTest tests/networking.nix { networkd = false; test = "static"; }; 294 - tests.networking.scripted.dhcpSimple = callTest tests/networking.nix { networkd = false; test = "dhcpSimple"; }; 295 - tests.networking.scripted.dhcpOneIf = callTest tests/networking.nix { networkd = false; test = "dhcpOneIf"; }; 296 - tests.networking.scripted.bond = callTest tests/networking.nix { networkd = false; test = "bond"; }; 297 - tests.networking.scripted.bridge = callTest tests/networking.nix { networkd = false; test = "bridge"; }; 298 - tests.networking.scripted.macvlan = callTest tests/networking.nix { networkd = false; test = "macvlan"; }; 299 - tests.networking.scripted.sit = callTest tests/networking.nix { networkd = false; test = "sit"; }; 300 - tests.networking.scripted.vlan = callTest tests/networking.nix { networkd = false; test = "vlan"; }; 273 + tests.networking.networkd = callSubTests tests/networking.nix { networkd = true; }; 274 + tests.networking.scripted = callSubTests tests/networking.nix { networkd = false; }; 301 275 # TODO: put in networking.nix after the test becomes more complete 302 276 tests.networkingProxy = callTest tests/networking-proxy.nix {}; 303 277 tests.nfs3 = callTest tests/nfs.nix { version = 3; }; ··· 317 291 tests.simple = callTest tests/simple.nix {}; 318 292 tests.tomcat = callTest tests/tomcat.nix {}; 319 293 tests.udisks2 = callTest tests/udisks2.nix {}; 320 - tests.virtualbox = let 321 - testsOnly = filterAttrs (const (t: t ? test)); 322 - vboxTests = testsOnly (import tests/virtualbox.nix { 323 - system = "x86_64-linux"; 324 - }); 325 - in mapAttrs (const (t: hydraJob t.test)) vboxTests; 294 + tests.virtualbox = callSubTests tests/virtualbox.nix { system = "x86_64-linux"; }; 326 295 tests.xfce = callTest tests/xfce.nix {}; 327 - tests.bootBiosCdrom = forAllSystems (system: hydraJob (import tests/boot.nix { inherit system; }).bootBiosCdrom); 328 - tests.bootBiosUsb = forAllSystems (system: hydraJob (import tests/boot.nix { inherit system; }).bootBiosUsb); 329 - tests.bootUefiCdrom = forAllSystems (system: hydraJob (import tests/boot.nix { inherit system; }).bootUefiCdrom); 330 - tests.bootUefiUsb = forAllSystems (system: hydraJob (import tests/boot.nix { inherit system; }).bootUefiUsb); 331 296 332 297 333 298 /* Build a bunch of typical closures so that Hydra can keep track of