From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2A55D158089 for ; Mon, 30 Oct 2023 03:14:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1ADE82BC01F; Mon, 30 Oct 2023 03:14:31 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F15812BC01F for ; Mon, 30 Oct 2023 03:14:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 054AC335C52 for ; Mon, 30 Oct 2023 03:14:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6288612F4 for ; Mon, 30 Oct 2023 03:14:28 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1698635662.4ce856328d23fffdd193b5fd1ceaab5e1bf414a8.sam@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: lib/portage/tests/emerge/ X-VCS-Repository: proj/portage X-VCS-Files: lib/portage/tests/emerge/conftest.py lib/portage/tests/emerge/test_simple.py X-VCS-Directories: lib/portage/tests/emerge/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 4ce856328d23fffdd193b5fd1ceaab5e1bf414a8 X-VCS-Branch: master Date: Mon, 30 Oct 2023 03:14:28 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ac17ae84-5c3d-4143-a7b2-e50c44d8ea77 X-Archives-Hash: aeb21f6471c30436b8349c05627b26ee commit: 4ce856328d23fffdd193b5fd1ceaab5e1bf414a8 Author: David Palao gmail com> AuthorDate: Wed Jun 21 10:03:53 2023 +0000 Commit: Sam James gentoo 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 gmail.com> Signed-off-by: Sam James 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()