diff options
Diffstat (limited to 'pym/portage/tests/process/test_poll.py')
| -rw-r--r-- | pym/portage/tests/process/test_poll.py | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/pym/portage/tests/process/test_poll.py b/pym/portage/tests/process/test_poll.py index d6667b4e0..3772d797f 100644 --- a/pym/portage/tests/process/test_poll.py +++ b/pym/portage/tests/process/test_poll.py @@ -4,7 +4,7 @@ from portage import os from portage.tests import TestCase from portage.util._pty import _create_pty_or_pipe -from _emerge.TaskScheduler import TaskScheduler +from portage.util._async.TaskScheduler import TaskScheduler from _emerge.PipeReader import PipeReader from _emerge.SpawnProcess import SpawnProcess @@ -37,25 +37,24 @@ class PipeReaderTestCase(TestCase): # in order to avoid issue 5380 with python3. master_file = os.fdopen(master_fd, 'rb', 0) slave_file = os.fdopen(slave_fd, 'wb', 0) - task_scheduler = TaskScheduler(max_jobs=2) producer = SpawnProcess( args=["bash", "-c", self._echo_cmd % test_string], - env=os.environ, fd_pipes={1:slave_fd}, - scheduler=task_scheduler.sched_iface) - task_scheduler.add(producer) - slave_file.close() + env=os.environ, fd_pipes={1:slave_fd}) consumer = PipeReader( input_files={"producer" : master_file}, - scheduler=task_scheduler.sched_iface, _use_array=self._use_array) + _use_array=self._use_array) - task_scheduler.add(consumer) + task_scheduler = TaskScheduler(iter([producer, consumer]), max_jobs=2) # This will ensure that both tasks have exited, which # is necessary to avoid "ResourceWarning: unclosed file" # warnings since Python 3.2 (and also ensures that we # don't leave any zombie child processes). - task_scheduler.run() + task_scheduler.start() + slave_file.close() + task_scheduler.wait() + self.assertEqual(producer.returncode, os.EX_OK) self.assertEqual(consumer.returncode, os.EX_OK) |