Add a new function to wait for arnied to be ready

[pyi2ncommon] / test / test_arnied_wrapper.py

diff --git a/test/test_arnied_wrapper.py b/test/test_arnied_wrapper.py
index ea41e82..57ab125 100755 (executable)
--- a/test/test_arnied_wrapper.py
+++ b/test/test_arnied_wrapper.py
@@ -50,6 +50,9 @@ class DummyCmdOutputMapping(object):
         {"cmd": 'rm -f /var/intranator/schedule/UPDATE_VIRSCAN_NODIAL*', "stdout": b"", "returncode": 0},
 
         {"cmd": '/usr/intranator/bin/arnied_helper --transfer-mail', "stdout": b"", "returncode": 0},
+
+        {"cmd": '/usr/intranator/bin/arnied_helper --wait-for-arnied-socket --wait-for-arnied-socket-timeout 10', "stdout": b"", "returncode": 0},
+        {"cmd": '/usr/intranator/bin/arnied_helper --wait-for-arnied-socket --wait-for-arnied-socket-timeout 30', "stdout": b"", "returncode": 0},
     ]
     asserted_cmds = []
 
@@ -88,6 +91,10 @@ class ArniedWrapperTest(unittest.TestCase):
         with self.assertRaises(RuntimeError):
             arnied_wrapper.verify_running(timeout=1)
 
+    def test_wait_for_arnied(self):
+        DummyCmdOutputMapping.asserted_cmds = self.cmd_db
+        arnied_wrapper.wait_for_arnied(timeout=10)
+
     def test_accept_license(self):
         DummyCmdOutputMapping.asserted_cmds = self.cmd_db[1:3]
         arnied_wrapper.accept_licence()
@@ -101,7 +108,7 @@ class ArniedWrapperTest(unittest.TestCase):
         arnied_wrapper.go_online(1)
 
     def test_disable_virscan(self):
-        DummyCmdOutputMapping.asserted_cmds = self.cmd_db[6:14]
+        DummyCmdOutputMapping.asserted_cmds = self.cmd_db[6:]
         arnied_wrapper.disable_virscan()
 
     def test_email_transfer(self):