From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 5 Sep 2010 19:24:49 +0000 (-0700)
Subject: Make LazyImportPortageBaselineTestCase use a PollScheduler instance
X-Git-Tag: v2.2_rc76~30
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=d4f0fba6d7a057358a3cfffc216108e6ca3aa53d;p=portage.git

Make LazyImportPortageBaselineTestCase use a PollScheduler instance
directly since TaskScheduler isn't really needed.
---

diff --git a/pym/portage/tests/lazyimport/test_lazy_import_portage_baseline.py b/pym/portage/tests/lazyimport/test_lazy_import_portage_baseline.py
index d96f83a9b..f434573d0 100644
--- a/pym/portage/tests/lazyimport/test_lazy_import_portage_baseline.py
+++ b/pym/portage/tests/lazyimport/test_lazy_import_portage_baseline.py
@@ -6,7 +6,7 @@ import portage
 from portage import os
 from portage.tests import TestCase
 
-from _emerge.TaskScheduler import TaskScheduler
+from _emerge.PollScheduler import PollScheduler
 from _emerge.PipeReader import PipeReader
 from _emerge.SpawnProcess import SpawnProcess
 
@@ -30,23 +30,23 @@ class LazyImportPortageBaselineTestCase(TestCase):
 		Check what modules are imported by a baseline module import.
 		"""
 
-		task_scheduler = TaskScheduler()
+		scheduler = PollScheduler().sched_iface
 		master_fd, slave_fd = os.pipe()
 		master_file = os.fdopen(master_fd, 'rb')
 		slave_file = os.fdopen(slave_fd, 'wb')
 		producer = SpawnProcess(
 			args=self._baseline_import_cmd,
 			env=os.environ, fd_pipes={1:slave_fd},
-			scheduler=task_scheduler.sched_iface)
+			scheduler=scheduler)
 		producer.start()
 		slave_file.close()
 
 		consumer = PipeReader(
 			input_files={"producer" : master_file},
-			scheduler=task_scheduler.sched_iface)
+			scheduler=scheduler)
 
-		task_scheduler.add(consumer)
-		task_scheduler.run()
+		consumer.start()
+		consumer.wait()
 		output = consumer.getvalue().decode('ascii', 'replace').split()
 
 		unexpected_modules = " ".join(sorted(x for x in output \