public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Factor out some test commonality. 

svn path=/nixos/trunk/; revision=26394
This commit is contained in:
Eelco Dolstra 2011-03-17 14:04:47 +00:00
parent 6ee609a0a3
commit c52aeacf1a
3 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tests/common/user-account.nix Normal file
View File

@ -0,0 +1,11 @@
{ pkgs, ... }:
{ users.extraUsers = pkgs.lib.singleton
{ name = "alice";
description = "Alice Foobar";
home = "/home/alice";
createHome = true;
useDefaultShell = true;
password = "foobar";
};
}

13
tests/kde4.nix
View File

@ -5,7 +5,9 @@
machine = machine =
{ config, pkgs, ... }: { config, pkgs, ... }:
{ services.xserver.enable = true; { require = [ ./common/user-account.nix ];
services.xserver.enable = true;
services.httpd.enable = true; services.httpd.enable = true;
services.httpd.adminAddr = "foo@example.org"; services.httpd.adminAddr = "foo@example.org";
@ -21,15 +23,6 @@
''; '';
services.xserver.desktopManager.kde4.enable = true; services.xserver.desktopManager.kde4.enable = true;
users.extraUsers = pkgs.lib.singleton
{ name = "alice";
description = "Alice Foobar";
home = "/home/alice";
createHome = true;
useDefaultShell = true;
password = "foobar";
};
}; };
testScript = testScript =

13
tests/xfce.nix
View File

@ -5,21 +5,14 @@
machine = machine =
{ config, pkgs, ... }: { config, pkgs, ... }:
{ services.xserver.enable = true; { require = [ ./common/user-account.nix ];
services.xserver.enable = true;
services.xserver.displayManager.auto.enable = true; services.xserver.displayManager.auto.enable = true;
services.xserver.displayManager.auto.user = "alice"; services.xserver.displayManager.auto.user = "alice";
services.xserver.desktopManager.xfce.enable = true; services.xserver.desktopManager.xfce.enable = true;
users.extraUsers = pkgs.lib.singleton
{ name = "alice";
description = "Alice Foobar";
home = "/home/alice";
createHome = true;
useDefaultShell = true;
password = "foobar";
};
}; };
testScript = testScript =