From f880347b17367845bd22dff6c6c268ede6cf0552 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sun, 17 Nov 2019 15:11:31 +0100 Subject: [PATCH 1/2] nixosTests.rxe: port to python --- nixos/tests/rxe.nix | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/nixos/tests/rxe.nix b/nixos/tests/rxe.nix index d0b53db8eeb6..726dcc654048 100644 --- a/nixos/tests/rxe.nix +++ b/nixos/tests/rxe.nix @@ -1,4 +1,4 @@ -import ./make-test.nix ({ ... } : +import ./make-test-python.nix ({ ... } : let node = { pkgs, ... } : { @@ -26,27 +26,27 @@ in { testScript = '' # Test if rxe interface comes up - $server->waitForUnit("default.target"); - $server->succeed("systemctl status rxe.service"); - $server->succeed("ibv_devices | grep rxe0"); + server.wait_for_unit("default.target") + server.succeed("systemctl status rxe.service") + server.succeed("ibv_devices | grep rxe0") - $client->waitForUnit("default.target"); + client.wait_for_unit("default.target") # ping pong test - $server->succeed("screen -dmS rc_pingpong ibv_rc_pingpong -p 4800 -g0"); - $client->succeed("sleep 2; ibv_rc_pingpong -p 4800 -g0 server"); + server.succeed("screen -dmS rc_pingpong ibv_rc_pingpong -p 4800 -g0") + client.succeed("sleep 2; ibv_rc_pingpong -p 4800 -g0 server") - $server->succeed("screen -dmS uc_pingpong ibv_uc_pingpong -p 4800 -g0"); - $client->succeed("sleep 2; ibv_uc_pingpong -p 4800 -g0 server"); + server.succeed("screen -dmS uc_pingpong ibv_uc_pingpong -p 4800 -g0") + client.succeed("sleep 2; ibv_uc_pingpong -p 4800 -g0 server") - $server->succeed("screen -dmS ud_pingpong ibv_ud_pingpong -p 4800 -s 1024 -g0"); - $client->succeed("sleep 2; ibv_ud_pingpong -p 4800 -s 1024 -g0 server"); + server.succeed("screen -dmS ud_pingpong ibv_ud_pingpong -p 4800 -s 1024 -g0") + client.succeed("sleep 2; ibv_ud_pingpong -p 4800 -s 1024 -g0 server") - $server->succeed("screen -dmS srq_pingpong ibv_srq_pingpong -p 4800 -g0"); - $client->succeed("sleep 2; ibv_srq_pingpong -p 4800 -g0 server"); + server.succeed("screen -dmS srq_pingpong ibv_srq_pingpong -p 4800 -g0") + client.succeed("sleep 2; ibv_srq_pingpong -p 4800 -g0 server") - $server->succeed("screen -dmS rping rping -s -a server -C 10"); - $client->succeed("sleep 2; rping -c -a server -C 10"); + server.succeed("screen -dmS rping rping -s -a server -C 10") + client.succeed("sleep 2; rping -c -a server -C 10") ''; }) From f2564a40087bf2d9c061687b36da561a0c5e70fd Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 20 Nov 2019 20:47:45 +0100 Subject: [PATCH 2/2] nixosTests.rxe: cleanup with loop serveral protocols --- nixos/tests/rxe.nix | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/nixos/tests/rxe.nix b/nixos/tests/rxe.nix index 726dcc654048..194a2e3d2b94 100644 --- a/nixos/tests/rxe.nix +++ b/nixos/tests/rxe.nix @@ -32,18 +32,12 @@ in { client.wait_for_unit("default.target") - # ping pong test - server.succeed("screen -dmS rc_pingpong ibv_rc_pingpong -p 4800 -g0") - client.succeed("sleep 2; ibv_rc_pingpong -p 4800 -g0 server") - - server.succeed("screen -dmS uc_pingpong ibv_uc_pingpong -p 4800 -g0") - client.succeed("sleep 2; ibv_uc_pingpong -p 4800 -g0 server") - - server.succeed("screen -dmS ud_pingpong ibv_ud_pingpong -p 4800 -s 1024 -g0") - client.succeed("sleep 2; ibv_ud_pingpong -p 4800 -s 1024 -g0 server") - - server.succeed("screen -dmS srq_pingpong ibv_srq_pingpong -p 4800 -g0") - client.succeed("sleep 2; ibv_srq_pingpong -p 4800 -g0 server") + # ping pong tests + for proto in "rc", "uc", "ud", "srq": + server.succeed( + "screen -dmS {0}_pingpong ibv_{0}_pingpong -p 4800 -s 1024 -g0".format(proto) + ) + client.succeed("sleep 2; ibv_{}_pingpong -p 4800 -s 1024 -g0 server".format(proto)) server.succeed("screen -dmS rping rping -s -a server -C 10") client.succeed("sleep 2; rping -c -a server -C 10")