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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 16B1C138350 for ; Sat, 2 May 2020 22:03:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4E001E0880; Sat, 2 May 2020 22:03:39 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 20DF2E0880 for ; Sat, 2 May 2020 22:03:39 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BD37034F2D1 for ; Sat, 2 May 2020 22:03:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4C9E31B4 for ; Sat, 2 May 2020 22:03:04 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1588456850.e4b3d6e57855ae635e0d9fffddb195d8f819e7c9.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: lib/portage/tests/resolver/, lib/portage/tests/dbapi/ X-VCS-Repository: proj/portage X-VCS-Files: lib/portage/tests/dbapi/test_auxdb.py lib/portage/tests/resolver/ResolverPlayground.py X-VCS-Directories: lib/portage/tests/dbapi/ lib/portage/tests/resolver/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: e4b3d6e57855ae635e0d9fffddb195d8f819e7c9 X-VCS-Branch: master Date: Sat, 2 May 2020 22:03:04 +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: aa6b98fc-fd92-4329-94b2-87e2f6b1730a X-Archives-Hash: 4f542bac0493520a279b5dd952b1dd99 commit: e4b3d6e57855ae635e0d9fffddb195d8f819e7c9 Author: Zac Medico gentoo org> AuthorDate: Sat May 2 21:41:30 2020 +0000 Commit: Zac Medico gentoo org> CommitDate: Sat May 2 22:00:50 2020 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=e4b3d6e5 AuxdbTestCase: test eclass inheritance Signed-off-by: Zac Medico gentoo.org> lib/portage/tests/dbapi/test_auxdb.py | 32 +++++++++++++++++++----- lib/portage/tests/resolver/ResolverPlayground.py | 16 +++++++++--- 2 files changed, 38 insertions(+), 10 deletions(-) diff --git a/lib/portage/tests/dbapi/test_auxdb.py b/lib/portage/tests/dbapi/test_auxdb.py index cfcabc8bb..85d64c15e 100644 --- a/lib/portage/tests/dbapi/test_auxdb.py +++ b/lib/portage/tests/dbapi/test_auxdb.py @@ -34,24 +34,44 @@ class AuxdbTestCase(TestCase): def _test_mod(self, auxdbmodule): ebuilds = { "cat/A-1": { - "EAPI": "7" + "EAPI": "7", + "MISC_CONTENT": "inherit foo", }, "cat/B-1": { - "EAPI": "7" + "EAPI": "7", + "MISC_CONTENT": "inherit foo", }, } - playground = ResolverPlayground(ebuilds=ebuilds, + ebuild_inherited = frozenset(["bar", "foo"]) + eclass_defined_phases = "prepare" + eclass_depend = "bar/foo" + + eclasses = { + "foo": ( + "inherit bar", + ), + "bar": ( + "EXPORT_FUNCTIONS src_prepare", + "DEPEND=\"{}\"".format(eclass_depend), + "bar_src_prepare() { default; }", + ), + } + + playground = ResolverPlayground(ebuilds=ebuilds, eclasses=eclasses, user_config={'modules': ('portdbapi.auxdbmodule = %s' % auxdbmodule,)}) portdb = playground.trees[playground.eroot]["porttree"].dbapi loop = asyncio._wrap_loop() - loop.run_until_complete(self._test_mod_async(ebuilds, portdb)) + loop.run_until_complete(self._test_mod_async(ebuilds, ebuild_inherited, eclass_defined_phases, eclass_depend, portdb)) @coroutine - def _test_mod_async(self, ebuilds, portdb): + def _test_mod_async(self, ebuilds, ebuild_inherited, eclass_defined_phases, eclass_depend, portdb): for cpv, metadata in ebuilds.items(): - eapi, = yield portdb.async_aux_get(cpv, ['EAPI']) + defined_phases, depend, eapi, inherited = yield portdb.async_aux_get(cpv, ['DEFINED_PHASES', 'DEPEND', 'EAPI', 'INHERITED']) + self.assertEqual(defined_phases, eclass_defined_phases) + self.assertEqual(depend, eclass_depend) self.assertEqual(eapi, metadata['EAPI']) + self.assertEqual(frozenset(inherited.split()), ebuild_inherited) diff --git a/lib/portage/tests/resolver/ResolverPlayground.py b/lib/portage/tests/resolver/ResolverPlayground.py index 0456ce2e2..98831e000 100644 --- a/lib/portage/tests/resolver/ResolverPlayground.py +++ b/lib/portage/tests/resolver/ResolverPlayground.py @@ -67,7 +67,7 @@ class ResolverPlayground(object): """ def __init__(self, ebuilds={}, binpkgs={}, installed={}, profile={}, repo_configs={}, \ - user_config={}, sets={}, world=[], world_sets=[], distfiles={}, + user_config={}, sets={}, world=[], world_sets=[], distfiles={}, eclasses={}, eprefix=None, targetroot=False, debug=False): """ ebuilds: cpv -> metadata mapping simulating available ebuilds. @@ -159,7 +159,7 @@ class ResolverPlayground(object): self._create_ebuilds(ebuilds) self._create_binpkgs(binpkgs) self._create_installed(installed) - self._create_profile(ebuilds, installed, profile, repo_configs, user_config, sets) + self._create_profile(ebuilds, eclasses, installed, profile, repo_configs, user_config, sets) self._create_world(world, world_sets) self.settings, self.trees = self._load_config() @@ -346,7 +346,7 @@ class ResolverPlayground(object): with open(ebuild_path, 'rb') as inputfile: f.write(inputfile.read()) - def _create_profile(self, ebuilds, installed, profile, repo_configs, user_config, sets): + def _create_profile(self, ebuilds, eclasses, installed, profile, repo_configs, user_config, sets): user_config_dir = os.path.join(self.eroot, USER_CONFIG_PATH) @@ -404,7 +404,15 @@ class ResolverPlayground(object): f.write("masters =\n") #Create $profile_dir/eclass (we fail to digest the ebuilds if it's not there) - os.makedirs(os.path.join(repo_dir, "eclass")) + eclass_dir = os.path.join(repo_dir, "eclass") + os.makedirs(eclass_dir) + + for eclass_name, eclass_content in eclasses.items(): + with open(os.path.join(eclass_dir, "{}.eclass".format(eclass_name)), 'wt') as f: + if isinstance(eclass_content, basestring): + eclass_content = [eclass_content] + for line in eclass_content: + f.write("{}\n".format(line)) # Temporarily write empty value of masters until it becomes default. if not repo_config or "layout.conf" not in repo_config: