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: e8e946a0602e
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 758b1b9a040f
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 25, 2019

  1. Copy the full SHA
    f5746f9 View commit details
  2. Copy the full SHA
    3b0a0ad View commit details

Commits on Jan 31, 2020

  1. Merge pull request #74124 from filalex77/nixosTests.riak-python

    nixosTests.riak: port to python
    worldofpeace authored Jan 31, 2020
    Copy the full SHA
    758b1b9 View commit details
Showing with 11 additions and 14 deletions.
  1. +11 −14 nixos/tests/riak.nix
25 changes: 11 additions & 14 deletions nixos/tests/riak.nix
Original file line number Diff line number Diff line change
@@ -1,21 +1,18 @@
import ./make-test.nix {
import ./make-test-python.nix ({ lib, pkgs, ... }: {
name = "riak";
meta = with lib.maintainers; {
maintainers = [ filalex77 ];
};

nodes = {
master =
{ pkgs, ... }:

{
services.riak.enable = true;
services.riak.package = pkgs.riak;
};
machine = {
services.riak.enable = true;
services.riak.package = pkgs.riak;
};

testScript = ''
startAll;
machine.start()
$master->waitForUnit("riak");
$master->sleep(20); # Hopefully this is long enough!!
$master->succeed("riak ping 2>&1");
machine.wait_for_unit("riak")
machine.wait_until_succeeds("riak ping 2>&1")
'';
}
})