commit faa19418f5b90336acfb4fa3c54b1f67993d00da · pyrox.dev/nixpkgs

+1 -1

nixos/tests/all-tests.nix

···

       829
       829
        
         mosquitto = runTest ./mosquitto.nix;

     

       830
       830
        
         moosefs = handleTest ./moosefs.nix { };

     

       831
       831
        
         movim = import ./web-apps/movim { inherit recurseIntoAttrs runTest; };

     

       832
       832
       -
         mpd = handleTest ./mpd.nix { };

     

       832
       832
       +
         mpd = runTest ./mpd.nix;

     

       833
       833
        
         mpv = runTest ./mpv.nix;

     

       834
       834
        
         mtp = handleTest ./mtp.nix { };

     

       835
       835
        
         multipass = handleTest ./multipass.nix { };

+125 -127

nixos/tests/mpd.nix

···

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

     

       2
       2
       -
         { pkgs, lib, ... }:

     

       3
       3
       -
         let

     

       4
       4
       -
           track = pkgs.fetchurl {

     

       5
       5
       -
             # Sourced from http://freemusicarchive.org/music/Blue_Wave_Theory/Surf_Music_Month_Challenge/Skyhawk_Beach_fade_in

     

       1
       1
       +
       { pkgs, lib, ... }:

     

       2
       2
       +
       let

     

       3
       3
       +
         track = pkgs.fetchurl {

     

       4
       4
       +
           # Sourced from http://freemusicarchive.org/music/Blue_Wave_Theory/Surf_Music_Month_Challenge/Skyhawk_Beach_fade_in

     

       6
       5
        
       

     

       7
       7
       -
             name = "Blue_Wave_Theory-Skyhawk_Beach.mp3";

     

       8
       8
       -
             url = "https://freemusicarchive.org/file/music/ccCommunity/Blue_Wave_Theory/Surf_Music_Month_Challenge/Blue_Wave_Theory_-_04_-_Skyhawk_Beach.mp3";

     

       9
       9
       -
             hash = "sha256-91VDWwrcP6Cw4rk72VHvZ8RGfRBrpRE8xo/02dcJhHc=";

     

       10
       10
       -
             meta.license = lib.licenses.cc-by-sa-40;

     

       11
       11
       -
           };

     

       6
       6
       +
           name = "Blue_Wave_Theory-Skyhawk_Beach.mp3";

     

       7
       7
       +
           url = "https://freemusicarchive.org/file/music/ccCommunity/Blue_Wave_Theory/Surf_Music_Month_Challenge/Blue_Wave_Theory_-_04_-_Skyhawk_Beach.mp3";

     

       8
       8
       +
           hash = "sha256-91VDWwrcP6Cw4rk72VHvZ8RGfRBrpRE8xo/02dcJhHc=";

     

       9
       9
       +
           meta.license = lib.licenses.cc-by-sa-40;

     

       10
       10
       +
         };

     

       12
       11
        
       

     

       13
       13
       -
           defaultCfg = rec {

     

       14
       14
       -
             user = "mpd";

     

       15
       15
       -
             group = "mpd";

     

       16
       16
       -
             dataDir = "/var/lib/mpd";

     

       17
       17
       -
             musicDirectory = "${dataDir}/music";

     

       18
       18
       -
           };

     

       12
       12
       +
         defaultCfg = rec {

     

       13
       13
       +
           user = "mpd";

     

       14
       14
       +
           group = "mpd";

     

       15
       15
       +
           dataDir = "/var/lib/mpd";

     

       16
       16
       +
           musicDirectory = "${dataDir}/music";

     

       17
       17
       +
         };

     

       19
       18
        
       

     

       20
       20
       -
           defaultMpdCfg = {

     

       21
       21
       -
             inherit (defaultCfg)

     

       22
       22
       -
               dataDir

     

       23
       23
       -
               musicDirectory

     

       24
       24
       -
               user

     

       25
       25
       -
               group

     

       26
       26
       -
               ;

     

       27
       27
       -
             enable = true;

     

       28
       28
       -
           };

     

       19
       19
       +
         defaultMpdCfg = {

     

       20
       20
       +
           inherit (defaultCfg)

     

       21
       21
       +
             dataDir

     

       22
       22
       +
             musicDirectory

     

       23
       23
       +
             user

     

       24
       24
       +
             group

     

       25
       25
       +
             ;

     

       26
       26
       +
           enable = true;

     

       27
       27
       +
         };

     

       29
       28
        
       

     

       30
       30
       -
           musicService =

     

       31
       31
       -
             {

     

       32
       32
       -
               user,

     

       33
       33
       -
               group,

     

       34
       34
       -
               musicDirectory,

     

       35
       35
       -
             }:

     

       36
       36
       -
             {

     

       37
       37
       -
               description = "Sets up the music file(s) for MPD to use.";

     

       38
       38
       -
               requires = [ "mpd.service" ];

     

       39
       39
       -
               after = [ "mpd.service" ];

     

       40
       40
       -
               wantedBy = [ "default.target" ];

     

       41
       41
       -
               script = ''

     

       42
       42
       -
                 cp ${track} ${musicDirectory}

     

       43
       43
       -
               '';

     

       44
       44
       -
               serviceConfig = {

     

       45
       45
       -
                 User = user;

     

       46
       46
       -
                 Group = group;

     

       47
       47
       -
               };

     

       29
       29
       +
         musicService =

     

       30
       30
       +
           {

     

       31
       31
       +
             user,

     

       32
       32
       +
             group,

     

       33
       33
       +
             musicDirectory,

     

       34
       34
       +
           }:

     

       35
       35
       +
           {

     

       36
       36
       +
             description = "Sets up the music file(s) for MPD to use.";

     

       37
       37
       +
             requires = [ "mpd.service" ];

     

       38
       38
       +
             after = [ "mpd.service" ];

     

       39
       39
       +
             wantedBy = [ "default.target" ];

     

       40
       40
       +
             script = ''

     

       41
       41
       +
               cp ${track} ${musicDirectory}

     

       42
       42
       +
             '';

     

       43
       43
       +
             serviceConfig = {

     

       44
       44
       +
               User = user;

     

       45
       45
       +
               Group = group;

     

       48
       46
        
             };

     

       47
       47
       +
           };

     

       49
       48
        
       

     

       50
       50
       -
           mkServer =

     

       51
       51
       -
             { mpd, musicService }:

     

       52
       52
       -
             {

     

       53
       53
       -
               boot.kernelModules = [ "snd-dummy" ];

     

       54
       54
       -
               services.mpd = mpd;

     

       55
       55
       -
               systemd.services.musicService = musicService;

     

       56
       56
       -
             };

     

       57
       57
       -
         in

     

       58
       58
       -
         {

     

       59
       59
       -
           name = "mpd";

     

       60
       60
       -
           meta = {

     

       61
       61
       -
             maintainers = with lib.maintainers; [ emmanuelrosa ];

     

       49
       49
       +
         mkServer =

     

       50
       50
       +
           { mpd, musicService }:

     

       51
       51
       +
           {

     

       52
       52
       +
             boot.kernelModules = [ "snd-dummy" ];

     

       53
       53
       +
             services.mpd = mpd;

     

       54
       54
       +
             systemd.services.musicService = musicService;

     

       62
       55
        
           };

     

       56
       56
       +
       in

     

       57
       57
       +
       {

     

       58
       58
       +
         name = "mpd";

     

       59
       59
       +
         meta = {

     

       60
       60
       +
           maintainers = with lib.maintainers; [ emmanuelrosa ];

     

       61
       61
       +
         };

     

       63
       62
        
       

     

       64
       64
       -
           nodes = {

     

       65
       65
       -
             client = { ... }: { };

     

       63
       63
       +
         nodes = {

     

       64
       64
       +
           client = { ... }: { };

     

       66
       65
        
       

     

       67
       67
       -
             serverALSA =

     

       68
       68
       -
               { ... }:

     

       69
       69
       -
               lib.mkMerge [

     

       70
       70
       -
                 (mkServer {

     

       71
       71
       -
                   mpd = defaultMpdCfg // {

     

       72
       72
       -
                     network.listenAddress = "any";

     

       73
       73
       -
                     extraConfig = ''

     

       74
       74
       -
                       audio_output {

     

       75
       75
       -
                         type "alsa"

     

       76
       76
       -
                         name "ALSA"

     

       77
       77
       -
                         mixer_type "null"

     

       78
       78
       -
                       }

     

       79
       79
       -
                     '';

     

       80
       80
       -
                   };

     

       81
       81
       -
                   musicService = musicService { inherit (defaultMpdCfg) user group musicDirectory; };

     

       82
       82
       -
                 })

     

       83
       83
       -
                 { networking.firewall.allowedTCPPorts = [ 6600 ]; }

     

       84
       84
       -
               ];

     

       66
       66
       +
           serverALSA =

     

       67
       67
       +
             { ... }:

     

       68
       68
       +
             lib.mkMerge [

     

       69
       69
       +
               (mkServer {

     

       70
       70
       +
                 mpd = defaultMpdCfg // {

     

       71
       71
       +
                   network.listenAddress = "any";

     

       72
       72
       +
                   extraConfig = ''

     

       73
       73
       +
                     audio_output {

     

       74
       74
       +
                       type "alsa"

     

       75
       75
       +
                       name "ALSA"

     

       76
       76
       +
                       mixer_type "null"

     

       77
       77
       +
                     }

     

       78
       78
       +
                   '';

     

       79
       79
       +
                 };

     

       80
       80
       +
                 musicService = musicService { inherit (defaultMpdCfg) user group musicDirectory; };

     

       81
       81
       +
               })

     

       82
       82
       +
               { networking.firewall.allowedTCPPorts = [ 6600 ]; }

     

       83
       83
       +
             ];

     

       85
       84
        
       

     

       86
       86
       -
             serverPulseAudio =

     

       87
       87
       -
               { ... }:

     

       88
       88
       -
               lib.mkMerge [

     

       89
       89
       -
                 (mkServer {

     

       90
       90
       -
                   mpd = defaultMpdCfg // {

     

       91
       91
       -
                     extraConfig = ''

     

       92
       92
       -
                       audio_output {

     

       93
       93
       -
                         type "pulse"

     

       94
       94
       -
                         name "The Pulse"

     

       95
       95
       -
                       }

     

       96
       96
       -
                     '';

     

       97
       97
       -
                   };

     

       85
       85
       +
           serverPulseAudio =

     

       86
       86
       +
             { ... }:

     

       87
       87
       +
             lib.mkMerge [

     

       88
       88
       +
               (mkServer {

     

       89
       89
       +
                 mpd = defaultMpdCfg // {

     

       90
       90
       +
                   extraConfig = ''

     

       91
       91
       +
                     audio_output {

     

       92
       92
       +
                       type "pulse"

     

       93
       93
       +
                       name "The Pulse"

     

       94
       94
       +
                     }

     

       95
       95
       +
                   '';

     

       96
       96
       +
                 };

     

       98
       97
        
       

     

       99
       99
       -
                   musicService = musicService { inherit (defaultMpdCfg) user group musicDirectory; };

     

       100
       100
       -
                 })

     

       101
       101
       -
                 {

     

       102
       102
       -
                   services.pulseaudio = {

     

       103
       103
       -
                     enable = true;

     

       104
       104
       -
                     systemWide = true;

     

       105
       105
       -
                     tcp.enable = true;

     

       106
       106
       -
                     tcp.anonymousClients.allowAll = true;

     

       107
       107
       -
                   };

     

       108
       108
       -
                   systemd.services.mpd.environment.PULSE_SERVER = "localhost";

     

       109
       109
       -
                 }

     

       110
       110
       -
               ];

     

       111
       111
       -
           };

     

       98
       98
       +
                 musicService = musicService { inherit (defaultMpdCfg) user group musicDirectory; };

     

       99
       99
       +
               })

     

       100
       100
       +
               {

     

       101
       101
       +
                 services.pulseaudio = {

     

       102
       102
       +
                   enable = true;

     

       103
       103
       +
                   systemWide = true;

     

       104
       104
       +
                   tcp.enable = true;

     

       105
       105
       +
                   tcp.anonymousClients.allowAll = true;

     

       106
       106
       +
                 };

     

       107
       107
       +
                 systemd.services.mpd.environment.PULSE_SERVER = "localhost";

     

       108
       108
       +
               }

     

       109
       109
       +
             ];

     

       110
       110
       +
         };

     

       112
       111
        
       

     

       113
       113
       -
           testScript = ''

     

       114
       114
       -
             mpc = "${lib.getExe pkgs.mpc} --wait"

     

       112
       112
       +
         testScript = ''

     

       113
       113
       +
           mpc = "${lib.getExe pkgs.mpc} --wait"

     

       115
       114
        
       

     

       116
       116
       -
             # Connects to the given server and attempts to play a tune.

     

       117
       117
       -
             def play_some_music(server):

     

       118
       118
       -
                 server.wait_for_unit("mpd.service")

     

       119
       119
       -
                 server.succeed(f"{mpc} update")

     

       120
       120
       -
                 _, tracks = server.execute(f"{mpc} ls")

     

       115
       115
       +
           # Connects to the given server and attempts to play a tune.

     

       116
       116
       +
           def play_some_music(server):

     

       117
       117
       +
               server.wait_for_unit("mpd.service")

     

       118
       118
       +
               server.succeed(f"{mpc} update")

     

       119
       119
       +
               _, tracks = server.execute(f"{mpc} ls")

     

       121
       120
        
       

     

       122
       122
       -
                 for track in tracks.splitlines():

     

       123
       123
       -
                     server.succeed(f"{mpc} add {track}")

     

       121
       121
       +
               for track in tracks.splitlines():

     

       122
       122
       +
                   server.succeed(f"{mpc} add {track}")

     

       124
       123
        
       

     

       125
       125
       -
                 _, added_tracks = server.execute(f"{mpc} playlist")

     

       124
       124
       +
               _, added_tracks = server.execute(f"{mpc} playlist")

     

       126
       125
        
       

     

       127
       127
       -
                 # Check we succeeded adding audio tracks to the playlist

     

       128
       128
       -
                 assert len(added_tracks.splitlines()) > 0

     

       126
       126
       +
               # Check we succeeded adding audio tracks to the playlist

     

       127
       127
       +
               assert len(added_tracks.splitlines()) > 0

     

       129
       128
        
       

     

       130
       130
       -
                 server.succeed(f"{mpc} play")

     

       129
       129
       +
               server.succeed(f"{mpc} play")

     

       131
       130
        
       

     

       132
       132
       -
                 _, output = server.execute(f"{mpc} status")

     

       133
       133
       -
                 # Assure audio track is playing

     

       134
       134
       -
                 assert "playing" in output

     

       131
       131
       +
               _, output = server.execute(f"{mpc} status")

     

       132
       132
       +
               # Assure audio track is playing

     

       133
       133
       +
               assert "playing" in output

     

       135
       134
        
       

     

       136
       136
       -
                 server.succeed(f"{mpc} stop")

     

       135
       135
       +
               server.succeed(f"{mpc} stop")

     

       137
       136
        
       

     

       138
       137
        
       

     

       139
       139
       -
             play_some_music(serverALSA)

     

       140
       140
       -
             play_some_music(serverPulseAudio)

     

       138
       138
       +
           play_some_music(serverALSA)

     

       139
       139
       +
           play_some_music(serverPulseAudio)

     

       141
       140
        
       

     

       142
       142
       -
             client.wait_for_unit("multi-user.target")

     

       143
       143
       -
             client.succeed(f"{mpc} -h serverALSA status")

     

       141
       141
       +
           client.wait_for_unit("multi-user.target")

     

       142
       142
       +
           client.succeed(f"{mpc} -h serverALSA status")

     

       144
       143
        
       

     

       145
       145
       -
             # The PulseAudio-based server is configured not to accept external client connections

     

       146
       146
       -
             # to perform the following test:

     

       147
       147
       -
             client.fail(f"{mpc} -h serverPulseAudio status")

     

       148
       148
       -
           '';

     

       149
       149
       -
         }

     

       150
       150
       -
       )

     

       144
       144
       +
           # The PulseAudio-based server is configured not to accept external client connections

     

       145
       145
       +
           # to perform the following test:

     

       146
       146
       +
           client.fail(f"{mpc} -h serverPulseAudio status")

     

       147
       147
       +
         '';

     

       148
       148
       +
       }