summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-03-11 06:22:20 +0000
committerZac Medico <zmedico@gentoo.org>2009-03-11 06:22:20 +0000
commit1f0990a393def5f3139f90472480a2ad61e85038 (patch)
tree801f9d4acbfd87e56f71518dfc30733be5490c9e
parentf29be32f283b694c2179522d451ae6195ef23125 (diff)
downloadportage-1f0990a393def5f3139f90472480a2ad61e85038.tar.gz
portage-1f0990a393def5f3139f90472480a2ad61e85038.tar.bz2
portage-1f0990a393def5f3139f90472480a2ad61e85038.zip
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
-rw-r--r--pym/portage/tests/process/test_poll.py12
1 files changed, 7 insertions, 5 deletions
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())