From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 11 Mar 2009 06:22:20 +0000 (-0000)
Subject: Fix test breakage due to change in calling order of AsynchronousTask start
X-Git-Tag: v2.1.6.8~105
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1f0990a393def5f3139f90472480a2ad61e85038;p=portage.git

Fix test breakage due to change in calling order of AsynchronousTask start
listeners from r12713. (trunk r12717)

svn path=/main/branches/2.1.6/; revision=12972
---

diff --git a/pym/portage/tests/process/test_poll.py b/pym/portage/tests/process/test_poll.py
index ebcc822ef..904930410 100644
--- a/pym/portage/tests/process/test_poll.py
+++ b/pym/portage/tests/process/test_poll.py
@@ -33,7 +33,13 @@ class PipeReaderTestCase(TestCase):
 		task_scheduler = TaskScheduler(max_jobs=2)
 		scheduler = task_scheduler.sched_iface
 
-		producer = SpawnProcess(
+		class Producer(SpawnProcess):
+			def _spawn(self, args, **kwargs):
+				rval = SpawnProcess._spawn(self, args, **kwargs)
+				os.close(kwargs['fd_pipes'][1])
+				return rval
+
+		producer = Producer(
 			args=["bash", "-c", "echo -n '%s'" % test_string],
 			fd_pipes={1:slave_fd}, scheduler=scheduler)
 
@@ -44,10 +50,6 @@ class PipeReaderTestCase(TestCase):
 		task_scheduler.add(producer)
 		task_scheduler.add(consumer)
 
-		def producer_start_cb(task):
-			os.close(slave_fd)
-
-		producer.addStartListener(producer_start_cb)
 		task_scheduler.run()
 
 		self._assertEqual(test_string, consumer.getvalue())