summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--pym/portage/tests/lazyimport/test_lazy_import_portage_baseline.py12
1 files changed, 6 insertions, 6 deletions
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 \