From f5746f9c0b86a4cf197d4d6bd834940db865351a Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Mon, 25 Nov 2019 11:49:33 +0200 Subject: [PATCH] nixosTests.riak: port to python --- nixos/tests/riak.nix | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/nixos/tests/riak.nix b/nixos/tests/riak.nix index 68a9b7315b3..01baf656d14 100644 --- a/nixos/tests/riak.nix +++ b/nixos/tests/riak.nix @@ -1,21 +1,15 @@ -import ./make-test.nix { +import ./make-test-python.nix ({ lib, pkgs, ... }: { name = "riak"; - 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") ''; -} +})