* Factor out some test commonality.
svn path=/nixos/trunk/; revision=26394
This commit is contained in:
parent
6ee609a0a3
commit
c52aeacf1a
11
tests/common/user-account.nix
Normal file
11
tests/common/user-account.nix
Normal 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";
|
||||
};
|
||||
}
|
@ -5,7 +5,9 @@
|
||||
machine =
|
||||
{ config, pkgs, ... }:
|
||||
|
||||
{ services.xserver.enable = true;
|
||||
{ require = [ ./common/user-account.nix ];
|
||||
|
||||
services.xserver.enable = true;
|
||||
|
||||
services.httpd.enable = true;
|
||||
services.httpd.adminAddr = "foo@example.org";
|
||||
@ -21,15 +23,6 @@
|
||||
'';
|
||||
|
||||
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 =
|
||||
|
@ -5,21 +5,14 @@
|
||||
machine =
|
||||
{ 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.user = "alice";
|
||||
|
||||
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 =
|
||||
|
Loading…
Reference in New Issue
Block a user