From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id E9F831383EA for ; Fri, 11 Jan 2013 07:22:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1209CE0521; Fri, 11 Jan 2013 07:22:24 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 799BDE0521 for ; Fri, 11 Jan 2013 07:22:24 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 53ACA33D9C7 for ; Fri, 11 Jan 2013 07:22:23 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id A7580E4075 for ; Fri, 11 Jan 2013 07:22:21 +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: <1357888923.b5ef3cd3ef9261981f7f1dcadcdcf3f2a56d38f2.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/tests/ebuild/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/tests/ebuild/test_doebuild_spawn.py X-VCS-Directories: pym/portage/tests/ebuild/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: b5ef3cd3ef9261981f7f1dcadcdcf3f2a56d38f2 X-VCS-Branch: master Date: Fri, 11 Jan 2013 07:22:21 +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-Archives-Salt: bc56c78b-37cf-482c-a0fd-39e36a23be04 X-Archives-Hash: 19e76d066c8b49b4dec44079c1c31413 commit: b5ef3cd3ef9261981f7f1dcadcdcf3f2a56d38f2 Author: Zac Medico gentoo org> AuthorDate: Fri Jan 11 07:22:03 2013 +0000 Commit: Zac Medico gentoo org> CommitDate: Fri Jan 11 07:22:03 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=b5ef3cd3 DoebuildSpawnTestCase: also call spawn_nofetch --- pym/portage/tests/ebuild/test_doebuild_spawn.py | 39 ++++++++++++++++------- 1 files changed, 27 insertions(+), 12 deletions(-) diff --git a/pym/portage/tests/ebuild/test_doebuild_spawn.py b/pym/portage/tests/ebuild/test_doebuild_spawn.py index 6c66f81..ae9a5c5 100644 --- a/pym/portage/tests/ebuild/test_doebuild_spawn.py +++ b/pym/portage/tests/ebuild/test_doebuild_spawn.py @@ -1,12 +1,15 @@ # Copyright 2010-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 +import textwrap + from portage import os from portage import _python_interpreter from portage import _shell_quote from portage.const import EBUILD_SH_BINARY from portage.package.ebuild.config import config from portage.package.ebuild.doebuild import spawn as doebuild_spawn +from portage.package.ebuild._spawn_nofetch import spawn_nofetch from portage.tests import TestCase from portage.tests.resolver.ResolverPlayground import ResolverPlayground from portage.util._async.SchedulerInterface import SchedulerInterface @@ -24,27 +27,37 @@ class DoebuildSpawnTestCase(TestCase): """ def testDoebuildSpawn(self): - playground = ResolverPlayground() - try: - settings = config(clone=playground.settings) - if "__PORTAGE_TEST_HARDLINK_LOCKS" in os.environ: - settings["__PORTAGE_TEST_HARDLINK_LOCKS"] = \ - os.environ["__PORTAGE_TEST_HARDLINK_LOCKS"] - settings.backup_changes("__PORTAGE_TEST_HARDLINK_LOCKS") - cpv = 'sys-apps/portage-2.1' - metadata = { + ebuild_body = textwrap.dedent(""" + pkg_nofetch() { : ; } + """) + + ebuilds = { + 'sys-apps/portage-2.1': { 'EAPI' : '2', - 'INHERITED' : 'python eutils', 'IUSE' : 'build doc epydoc python3 selinux', 'KEYWORDS' : 'x86', 'LICENSE' : 'GPL-2', - 'PROVIDE' : 'virtual/portage', 'RDEPEND' : '>=app-shells/bash-3.2_p17 >=dev-lang/python-2.6', 'SLOT' : '0', - 'repository': 'gentoo', + "MISC_CONTENT": ebuild_body, } + } + + playground = ResolverPlayground(ebuilds=ebuilds) + try: root_config = playground.trees[playground.eroot]['root_config'] + portdb = root_config.trees["porttree"].dbapi + settings = config(clone=playground.settings) + if "__PORTAGE_TEST_HARDLINK_LOCKS" in os.environ: + settings["__PORTAGE_TEST_HARDLINK_LOCKS"] = \ + os.environ["__PORTAGE_TEST_HARDLINK_LOCKS"] + settings.backup_changes("__PORTAGE_TEST_HARDLINK_LOCKS") + + cpv = 'sys-apps/portage-2.1' + metadata = dict(zip(Package.metadata_keys, + portdb.aux_get(cpv, Package.metadata_keys))) + pkg = Package(built=False, cpv=cpv, installed=False, metadata=metadata, root_config=root_config, type_name='ebuild') @@ -86,5 +99,7 @@ class DoebuildSpawnTestCase(TestCase): ebuild_phase.start() ebuild_phase.wait() self.assertEqual(ebuild_phase.returncode, os.EX_OK) + + spawn_nofetch(portdb, portdb.findname(cpv), settings=settings) finally: playground.cleanup()