commit 603a95751ca092f588a625d13578109afb16aadf · pyrox.dev/nixpkgs

+1 -1

nixos/tests/all-tests.nix

···

       361
       361
        
         eintopf = handleTest ./eintopf.nix {};

     

       362
       362
        
         ejabberd = handleTest ./xmpp/ejabberd.nix {};

     

       363
       363
        
         elk = handleTestOn ["x86_64-linux"] ./elk.nix {};

     

       364
       364
       -
         emacs-daemon = handleTest ./emacs-daemon.nix {};

     

       364
       364
       +
         emacs-daemon = runTest ./emacs-daemon.nix;

     

       365
       365
        
         endlessh = handleTest ./endlessh.nix {};

     

       366
       366
        
         endlessh-go = handleTest ./endlessh-go.nix {};

     

       367
       367
        
         engelsystem = handleTest ./engelsystem.nix {};

+36 -40

nixos/tests/emacs-daemon.nix

···

       1
       1
       -
       import ./make-test-python.nix (

     

       2
       2
       -
         { pkgs, ... }:

     

       3
       3
       -
         {

     

       4
       4
       -
           name = "emacs-daemon";

     

       5
       5
       -
           meta = with pkgs.lib.maintainers; {

     

       6
       6
       -
             maintainers = [ ];

     

       7
       7
       -
           };

     

       1
       1
       +
       { lib, ... }:

     

       2
       2
       +
       {

     

       3
       3
       +
         name = "emacs-daemon";

     

       4
       4
       +
         meta.maintainers = lib.teams.emacs.members;

     

       8
       5
        
       

     

       9
       9
       -
           enableOCR = true;

     

       6
       6
       +
         enableOCR = true;

     

       10
       7
        
       

     

       11
       11
       -
           nodes.machine =

     

       12
       12
       -
             { ... }:

     

       8
       8
       +
         nodes.machine =

     

       9
       9
       +
           { ... }:

     

       13
       10
        
       

     

       14
       14
       -
             {

     

       15
       15
       -
               imports = [ ./common/x11.nix ];

     

       16
       16
       -
               services.emacs = {

     

       17
       17
       -
                 enable = true;

     

       18
       18
       -
                 defaultEditor = true;

     

       19
       19
       -
               };

     

       11
       11
       +
           {

     

       12
       12
       +
             imports = [ ./common/x11.nix ];

     

       13
       13
       +
             services.emacs = {

     

       14
       14
       +
               enable = true;

     

       15
       15
       +
               defaultEditor = true;

     

       16
       16
       +
             };

     

       20
       17
        
       

     

       21
       21
       -
               # Important to get the systemd service running for root

     

       22
       22
       -
               environment.variables.XDG_RUNTIME_DIR = "/run/user/0";

     

       18
       18
       +
             # Important to get the systemd service running for root

     

       19
       19
       +
             environment.variables.XDG_RUNTIME_DIR = "/run/user/0";

     

       23
       20
        
       

     

       24
       24
       -
               environment.variables.TEST_SYSTEM_VARIABLE = "system variable";

     

       25
       25
       -
             };

     

       21
       21
       +
             environment.variables.TEST_SYSTEM_VARIABLE = "system variable";

     

       22
       22
       +
           };

     

       26
       23
        
       

     

       27
       27
       -
           testScript = ''

     

       28
       28
       -
             machine.wait_for_unit("multi-user.target")

     

       24
       24
       +
         testScript = ''

     

       25
       25
       +
           machine.wait_for_unit("multi-user.target")

     

       29
       26
        
       

     

       30
       30
       -
             # checks that the EDITOR environment variable is set

     

       31
       31
       -
             machine.succeed('test $(basename "$EDITOR") = emacseditor')

     

       27
       27
       +
           # checks that the EDITOR environment variable is set

     

       28
       28
       +
           machine.succeed('test $(basename "$EDITOR") = emacseditor')

     

       32
       29
        
       

     

       33
       33
       -
             # waits for the emacs service to be ready

     

       34
       34
       -
             machine.wait_until_succeeds(

     

       35
       35
       -
                 "systemctl --user status emacs.service | grep 'Active: active'"

     

       36
       36
       -
             )

     

       30
       30
       +
           # waits for the emacs service to be ready

     

       31
       31
       +
           machine.wait_until_succeeds(

     

       32
       32
       +
               "systemctl --user status emacs.service | grep 'Active: active'"

     

       33
       33
       +
           )

     

       37
       34
        
       

     

       38
       38
       -
             # connects to the daemon

     

       39
       39
       -
             machine.succeed("emacsclient --no-wait --frame-parameters='((display . \"'\"$DISPLAY\"'\"))' --create-frame $EDITOR >&2")

     

       35
       35
       +
           # connects to the daemon

     

       36
       36
       +
           machine.succeed("emacsclient --no-wait --frame-parameters='((display . \"'\"$DISPLAY\"'\"))' --create-frame $EDITOR >&2")

     

       40
       37
        
       

     

       41
       41
       -
             # checks that Emacs shows the edited filename

     

       42
       42
       -
             machine.wait_for_text("emacseditor")

     

       38
       38
       +
           # checks that Emacs shows the edited filename

     

       39
       39
       +
           machine.wait_for_text("emacseditor")

     

       43
       40
        
       

     

       44
       44
       -
             # makes sure environment variables are accessible from Emacs

     

       45
       45
       -
             machine.succeed(

     

       46
       46
       -
                 "emacsclient --eval '(getenv \"TEST_SYSTEM_VARIABLE\")' | grep -q 'system variable'"

     

       47
       47
       -
             )

     

       41
       41
       +
           # makes sure environment variables are accessible from Emacs

     

       42
       42
       +
           machine.succeed(

     

       43
       43
       +
               "emacsclient --eval '(getenv \"TEST_SYSTEM_VARIABLE\")' | grep -q 'system variable'"

     

       44
       44
       +
           )

     

       48
       45
        
       

     

       49
       49
       -
             machine.screenshot("emacsclient")

     

       50
       50
       -
           '';

     

       51
       51
       -
         }

     

       52
       52
       -
       )

     

       46
       46
       +
           machine.screenshot("emacsclient")

     

       47
       47
       +
         '';

     

       48
       48
       +
       }