Use the already defined function to wait for generate
authorSamir Aguiar <samir.aguiar@intra2net.com>
Thu, 12 Aug 2021 21:26:25 +0000 (18:26 -0300)
committerChristian Herdtweck <christian.herdtweck@intra2net.com>
Fri, 10 Sep 2021 11:57:58 +0000 (13:57 +0200)
src/arnied_wrapper.py
test/test_arnied_wrapper.py

index 88f3344..b6d79d0 100644 (file)
@@ -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):
index e061150..bce22a8 100755 (executable)
@@ -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