Commit c52aeacf authored by Eelco Dolstra's avatar Eelco Dolstra
Browse files

* Factor out some test commonality. 

svn path=/nixos/trunk/; revision=26394
parent 6ee609a0

tests/common/user-account.nix

0 → 100644
+11 −0
Original line number Diff line number Diff line 
{ pkgs, ... }:



{ users.extraUsers = pkgs.lib.singleton

    { name = "alice";

      description = "Alice Foobar";

      home = "/home/alice";

      createHome = true;

      useDefaultShell = true;

      password = "foobar";

    };

}

tests/kde4.nix

+3 −10
Original line number Diff line number Diff line
@@ -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 =

tests/xfce.nix

+3 −10
Original line number Diff line number Diff line
@@ -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 =