From 1ac0318c8289a01dac4e9214df2ca702fbff275d Mon Sep 17 00:00:00 2001 From: Samir Aguiar Date: Thu, 12 Aug 2021 18:26:25 -0300 Subject: [PATCH] Use the already defined function to wait for generate --- src/arnied_wrapper.py | 3 +-- test/test_arnied_wrapper.py | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/arnied_wrapper.py b/src/arnied_wrapper.py index 88f3344..b6d79d0 100644 --- a/src/arnied_wrapper.py +++ b/src/arnied_wrapper.py @@ -142,8 +142,7 @@ def accept_licence(vm=None): cmd = 'echo "LICENSE_ACCEPTED,0: \\"1\\"" | set_cnf' result = run_cmd(cmd=cmd, ignore_errors=True, vm=vm) log.debug(result) - cmd = f"{BIN_ARNIED_HELPER} --wait-for-program-end GENERATE" - run_cmd(cmd=cmd, vm=vm) + wait_for_generate(vm=vm) def go_online(provider_id, wait_online=True, timeout=60, vm=None): diff --git a/test/test_arnied_wrapper.py b/test/test_arnied_wrapper.py index e061150..bce22a8 100755 --- a/test/test_arnied_wrapper.py +++ b/test/test_arnied_wrapper.py @@ -125,7 +125,7 @@ class ArniedWrapperTest(unittest.TestCase): def test_accept_license(self): """Test accepting license.""" - DummyCmdOutputMapping.asserted_cmds = self.cmd_db[1:3] + DummyCmdOutputMapping.asserted_cmds = self.cmd_db[1:3] + self.cmd_db[8:11] arnied_wrapper.accept_licence() # make sure an error is ignored since license might # already be accepted -- 1.7.1