From fa9af83e960aa982302bd367d8159f365eaa7471 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sun, 9 Feb 2020 16:21:52 -0500 Subject: [PATCH] testing-python: fix runInMachine The test script's were unported. It's unclear whether the preBuild or postBuild will work as expect, due to the linting of the test scripts. --- nixos/lib/testing-python.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nixos/lib/testing-python.nix b/nixos/lib/testing-python.nix index a7f6d7926514..36394c594b2b 100644 --- a/nixos/lib/testing-python.nix +++ b/nixos/lib/testing-python.nix @@ -218,12 +218,12 @@ in rec { ''; testScript = '' - startAll; - $client->waitForUnit("multi-user.target"); + start_all() + client.wait_for_unit("multi-user.target") ${preBuild} - $client->succeed("env -i ${bash}/bin/bash ${buildrunner} /tmp/xchg/saved-env >&2"); + client.succeed("env -i ${bash}/bin/bash ${buildrunner} /tmp/xchg/saved-env >&2") ${postBuild} - $client->succeed("sync"); # flush all data before pulling the plug + client.succeed("sync") # flush all data before pulling the plug ''; vmRunCommand = writeText "vm-run" '' @@ -274,7 +274,7 @@ in rec { machine = client; preBuild = '' - $client->waitForX; + client.wait_for_x() ''; } // args);