commit 20ad3329fe4305b15f9c3b8a01b75c43d83fbe74 · pyrox.dev/nixpkgs

+1 -1

nixos/tests/all-tests.nix

···

       1296
       1296
        
         xrdp-with-audio-pulseaudio = handleTest ./xrdp-with-audio-pulseaudio.nix {};

     

       1297
       1297
        
         xscreensaver = handleTest ./xscreensaver.nix {};

     

       1298
       1298
        
         xss-lock = handleTest ./xss-lock.nix {};

     

       1299
       1299
       -
         xterm = handleTest ./xterm.nix {};

     

       1299
       1299
       +
         xterm = runTest ./xterm.nix;

     

       1300
       1300
        
         xxh = runTest ./xxh.nix;

     

       1301
       1301
        
         yabar = runTest ./yabar.nix;

     

       1302
       1302
        
         ydotool = handleTest ./ydotool.nix {};

+20 -24

nixos/tests/xterm.nix

···

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

     

       2
       2
       -
         { pkgs, ... }:

     

       3
       3
       -
         {

     

       4
       4
       -
           name = "xterm";

     

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

     

       6
       6
       -
             maintainers = [ nequissimus ];

     

       7
       7
       -
           };

     

       1
       1
       +
       { pkgs, ... }:

     

       2
       2
       +
       {

     

       3
       3
       +
         name = "xterm";

     

       4
       4
       +
         meta = with pkgs.lib.maintainers; {

     

       5
       5
       +
           maintainers = [ nequissimus ];

     

       6
       6
       +
         };

     

       8
       7
        
       

     

       9
       9
       -
           nodes.machine =

     

       10
       10
       -
             { pkgs, ... }:

     

       11
       11
       -
             {

     

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

     

       13
       13
       -
               services.xserver.desktopManager.xterm.enable = false;

     

       14
       14
       -
             };

     

       8
       8
       +
         nodes.machine = {

     

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

     

       10
       10
       +
           services.xserver.desktopManager.xterm.enable = false;

     

       11
       11
       +
         };

     

       15
       12
        
       

     

       16
       16
       -
           testScript = ''

     

       17
       17
       -
             machine.wait_for_x()

     

       18
       18
       -
             machine.succeed("DISPLAY=:0 xterm -title testterm -class testterm -fullscreen >&2 &")

     

       19
       19
       -
             machine.sleep(2)

     

       20
       20
       -
             machine.send_chars("echo $XTERM_VERSION >> /tmp/xterm_version\n")

     

       21
       21
       -
             machine.wait_for_file("/tmp/xterm_version")

     

       22
       22
       -
             assert "${pkgs.xterm.version}" in machine.succeed("cat /tmp/xterm_version")

     

       23
       23
       -
             machine.screenshot("window")

     

       24
       24
       -
           '';

     

       25
       25
       -
         }

     

       26
       26
       -
       )

     

       13
       13
       +
         testScript = ''

     

       14
       14
       +
           machine.wait_for_x()

     

       15
       15
       +
           machine.succeed("DISPLAY=:0 xterm -title testterm -class testterm -fullscreen >&2 &")

     

       16
       16
       +
           machine.sleep(2)

     

       17
       17
       +
           machine.send_chars("echo $XTERM_VERSION >> /tmp/xterm_version\n")

     

       18
       18
       +
           machine.wait_for_file("/tmp/xterm_version")

     

       19
       19
       +
           assert "${pkgs.xterm.version}" in machine.succeed("cat /tmp/xterm_version")

     

       20
       20
       +
           machine.screenshot("window")

     

       21
       21
       +
         '';

     

       22
       22
       +
       }