Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0d2fd9018f7d
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a7fa51921ac0
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 22, 2019

  1. nixosTests.mpd: port to python

    @flokli
    flokli committed Nov 22, 2019
    Copy the full SHA
    5121706 View commit details

  2. Merge pull request #73935 from flokli/nixos-test-port-mpd 

    nixosTests.mpd: port to python
    @fpletz
    fpletz authored Nov 22, 2019
    Copy the full SHA
    a7fa519 View commit details
Showing with 22 additions and 23 deletions.
  1. +22 −23 nixos/tests/mpd.nix
45 changes: 22 additions & 23 deletions nixos/tests/mpd.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import ./make-test.nix ({ pkgs, lib, ... }:
import ./make-test-python.nix ({ pkgs, lib, ... }:
let
track = pkgs.fetchurl {
# Sourced from http://freemusicarchive.org/music/Blue_Wave_Theory/Surf_Music_Month_Challenge/Skyhawk_Beach_fade_in
@@ -94,40 +94,39 @@ import ./make-test.nix ({ pkgs, lib, ... }:
};

testScript = ''
my $mpc = "${pkgs.mpc_cli}/bin/mpc --wait";
mpc = "${pkgs.mpc_cli}/bin/mpc --wait"
# Connects to the given server and attempts to play a tune.
sub play_some_music {
my $server = $_[0];
def play_some_music(server):
server.wait_for_unit("mpd.service")
server.succeed(f"{mpc} update")
_, tracks = server.execute(f"{mpc} ls")
$server->waitForUnit("mpd.service");
$server->succeed("$mpc update");
my @tracks = $server->execute("$mpc ls");
for track in tracks.splitlines():
server.succeed(f"{mpc} add {track}")
for my $track (split(/\n/, $tracks[1])) {
$server->succeed("$mpc add $track");
};
_, added_tracks = server.execute(f"{mpc} listall")
my @added_tracks = $server->execute("$mpc listall");
(length $added_tracks[1]) > 0 or die "Failed to add audio tracks to the playlist.";
# Check we succeeded adding audio tracks to the playlist
assert len(added_tracks.splitlines()) > 0
$server->succeed("$mpc play");
server.succeed(f"{mpc} play")
my @status = $server->execute("$mpc status");
my @output = split(/\n/, $status[1]);
$output[1] =~ /.*playing.*/ or die "Audio track is not playing, as expected.";
_, output = server.execute(f"{mpc} status")
# Assure audio track is playing
assert "playing" in output
server.succeed(f"{mpc} stop")
$server->succeed("$mpc stop");
};
play_some_music($serverALSA);
play_some_music($serverPulseAudio);
play_some_music(serverALSA)
play_some_music(serverPulseAudio)
$client->waitForUnit("multi-user.target");
$client->succeed("$mpc -h serverALSA status");
client.wait_for_unit("multi-user.target")
client.succeed(f"{mpc} -h serverALSA status")
# The PulseAudio-based server is configured not to accept external client connections
# to perform the following test:
$client->fail("$mpc -h serverPulseAudio status");
client.fail(f"{mpc} -h serverPulseAudio status")
'';
})