commit:     ca08349fbec86a323037d5391717c10abc0421a8
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 14 19:42:36 2019 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Apr 14 19:44:21 2019 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=ca08349f

PipeReaderTestCase: use asyncio.create_subprocess_exec

Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 lib/portage/tests/process/test_poll.py | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/lib/portage/tests/process/test_poll.py 
b/lib/portage/tests/process/test_poll.py
index f700a5585..f505b5049 100644
--- a/lib/portage/tests/process/test_poll.py
+++ b/lib/portage/tests/process/test_poll.py
@@ -1,4 +1,4 @@
-# Copyright 1998-2018 Gentoo Foundation
+# Copyright 1998-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 import functools
@@ -6,13 +6,12 @@ import pty
 import shutil
 import socket
 import sys
-import subprocess
 import tempfile
 
 from portage import os
 from portage.tests import TestCase
-from portage.util._async.PopenProcess import PopenProcess
 from portage.util._eventloop.global_event_loop import global_event_loop
+from portage.util.futures import asyncio
 from _emerge.PipeReader import PipeReader
 
 class PipeReaderTestCase(TestCase):
@@ -68,17 +67,16 @@ class PipeReaderTestCase(TestCase):
                        input_files={"producer" : master_file},
                        _use_array=self._use_array,
                        scheduler=scheduler)
+               consumer.start()
 
-               producer = PopenProcess(
-                       pipe_reader=consumer,
-                       proc=subprocess.Popen(["bash", "-c", self._echo_cmd % 
test_string],
-                               stdout=slave_fd),
-                       scheduler=scheduler)
+               producer = 
scheduler.run_until_complete(asyncio.create_subprocess_exec(
+                       "bash", "-c", self._echo_cmd % test_string,
+                       stdout=slave_fd,
+                       loop=scheduler))
 
-               producer.start()
                os.close(slave_fd)
-               producer.wait()
-               consumer.wait()
+               scheduler.run_until_complete(producer.wait())
+               scheduler.run_until_complete(consumer.async_wait())
 
                self.assertEqual(producer.returncode, os.EX_OK)
                self.assertEqual(consumer.returncode, os.EX_OK)

Reply via email to