aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2021-01-18 03:42:30 -0800
committerZac Medico <zmedico@gentoo.org>2021-01-18 03:43:18 -0800
commit05555e4c062e9dc87ce290e29816df9d8871f25b (patch)
tree7922aeed6fbd5cafcc84037320c1810ba2b75f25
parentAuxdbTestCase: Use async and await syntax (diff)
downloadportage-05555e4c062e9dc87ce290e29816df9d8871f25b.tar.gz
portage-05555e4c062e9dc87ce290e29816df9d8871f25b.tar.bz2
portage-05555e4c062e9dc87ce290e29816df9d8871f25b.zip
SimpleEmergeTestCase: Use async and await syntax
Signed-off-by: Zac Medico <zmedico@gentoo.org>
-rw-r--r--lib/portage/tests/emerge/test_simple.py16
1 files changed, 7 insertions, 9 deletions
diff --git a/lib/portage/tests/emerge/test_simple.py b/lib/portage/tests/emerge/test_simple.py
index 1638fcb66..d26146aa9 100644
--- a/lib/portage/tests/emerge/test_simple.py
+++ b/lib/portage/tests/emerge/test_simple.py
@@ -1,4 +1,4 @@
-# Copyright 2011-2020 Gentoo Authors
+# Copyright 2011-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
import subprocess
@@ -14,7 +14,6 @@ from portage.tests.util.test_socks5 import AsyncHTTPServer
from portage.util import (ensure_dirs, find_updated_config_files,
shlex_split)
from portage.util.futures import asyncio
-from portage.util.futures.compat_coroutine import coroutine
class BinhostContentMap(Mapping):
@@ -225,8 +224,7 @@ call_has_and_best_version() {
loop.run_until_complete(asyncio.ensure_future(
self._async_test_simple(playground, metadata_xml_files, loop=loop), loop=loop))
- @coroutine
- def _async_test_simple(self, playground, metadata_xml_files, loop=None):
+ async def _async_test_simple(self, playground, metadata_xml_files, loop):
debug = playground.debug
settings = playground.settings
@@ -548,14 +546,14 @@ move dev-util/git dev-vcs/git
else:
local_env = env
- proc = yield asyncio.create_subprocess_exec(*args,
- env=local_env, stderr=None, stdout=stdout, loop=loop)
+ proc = await asyncio.create_subprocess_exec(*args,
+ env=local_env, stderr=None, stdout=stdout)
if debug:
- yield proc.wait()
+ await proc.wait()
else:
- output, _err = yield proc.communicate()
- yield proc.wait()
+ output, _err = await proc.communicate()
+ await proc.wait()
if proc.returncode != os.EX_OK:
portage.writemsg(output)