Add support for a timeout argument to QueueScheduler.run() and

use it in IpcDaemonTestCase to implement a 40 second timeout
in test cases.

1 files changed, 15 insertions, 1 deletions

diff --git a/pym/portage/tests/ebuild/test_ipc_daemon.py b/pym/portage/tests/ebuild/test_ipc_daemon.py
index 0a9a9a929..dee61a2d2 100644
--- a/pym/portage/tests/ebuild/test_ipc_daemon.py
+++ b/pym/portage/tests/ebuild/test_ipc_daemon.py
@@ -3,6 +3,8 @@
 
 import shutil
 import tempfile
+import time
+import portage
 from portage import os
 from portage import _python_interpreter
 from portage.tests import TestCase
@@ -16,6 +18,8 @@ from _emerge.TaskScheduler import TaskScheduler
 
 class IpcDaemonTestCase(TestCase):
 
+	_SCHEDULE_TIMEOUT = 40000 # 40 seconds
+
 	def testIpcDaemon(self):
 		tmpdir = tempfile.mkdtemp()
 		try:
@@ -49,13 +53,23 @@ class IpcDaemonTestCase(TestCase):
 					args=[BASH_BINARY, "-c",
 					'"$PORTAGE_BIN_PATH"/ebuild-ipc exit %d' % exitcode],
 					env=env, scheduler=task_scheduler.sched_iface)
+
+				self.received_command = False
 				def exit_command_callback():
+					self.received_command = True
 					proc.cancel()
 					daemon.cancel()
+
 				exit_command.reply_hook = exit_command_callback
 				task_scheduler.add(daemon)
 				task_scheduler.add(proc)
-				task_scheduler.run()
+				start_time = time.time()
+				task_scheduler.run(timeout=self._SCHEDULE_TIMEOUT)
+				task_scheduler.clear()
+
+				self.assertEqual(self.received_command, True,
+					"command not received after %d seconds" % \
+					(time.time() - start_time,))
 				self.assertEqual(exit_command.exitcode, exitcode)
 		finally:
 			shutil.rmtree(tmpdir)