[gentoo-commits] proj/portage:master commit in: lib/portage/tests/emerge/

["Sam James" <sam@gentoo.org>]

commit:     4ce856328d23fffdd193b5fd1ceaab5e1bf414a8
Author:     David Palao <david.palao <AT> gmail <DOT> com>
AuthorDate: Wed Jun 21 10:03:53 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Oct 30 03:14:22 2023 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=4ce85632

tests/emerge/test_simple.py: move playground cleaunp to fixture

Signed-off-by: David Palao <david.palao <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 lib/portage/tests/emerge/conftest.py    | 4 +++-
 lib/portage/tests/emerge/test_simple.py | 1 -
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/portage/tests/emerge/conftest.py b/lib/portage/tests/emerge/conftest.py
index 18077de257..8b62613fd6 100644
--- a/lib/portage/tests/emerge/conftest.py
+++ b/lib/portage/tests/emerge/conftest.py
@@ -168,7 +168,7 @@ def playground(request):
     """Fixture that provides instances of ``ResolverPlayground``
     each one with one supported value for ``BINPKG_FORMAT``."""
     binpkg_format = request.param
-    yield ResolverPlayground(
+    playground = ResolverPlayground(
         ebuilds=_AVAILABLE_EBUILDS,
         installed=_INSTALLED_EBUILDS,
         debug=False,
@@ -176,3 +176,5 @@ def playground(request):
             "make.conf": (f'BINPKG_FORMAT="{binpkg_format}"',),
         },
     )
+    yield playground
+    playground.cleanup()

diff --git a/lib/portage/tests/emerge/test_simple.py b/lib/portage/tests/emerge/test_simple.py
index 0907c51b33..2aa9b1bfc0 100644
--- a/lib/portage/tests/emerge/test_simple.py
+++ b/lib/portage/tests/emerge/test_simple.py
@@ -553,4 +553,3 @@ move dev-util/git dev-vcs/git
             assert os.EX_OK == proc.returncode, f"emerge failed with args {args}"
     finally:
         binhost_server.__exit__(None, None, None)
-        playground.cleanup()