From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QzIrB-0000gy-TW for garchives@archives.gentoo.org; Fri, 02 Sep 2011 01:47:46 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2444C21C06B; Fri, 2 Sep 2011 01:47:37 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id D1E9521C06B for ; Fri, 2 Sep 2011 01:47:36 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3DFC41B402A for ; Fri, 2 Sep 2011 01:47:36 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 9469B80042 for ; Fri, 2 Sep 2011 01:47:35 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <6feb5a12ed3b501ea5f65dad14d4026105469ad9.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/tests/emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/tests/emerge/test_simple.py X-VCS-Directories: pym/portage/tests/emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 6feb5a12ed3b501ea5f65dad14d4026105469ad9 Date: Fri, 2 Sep 2011 01:47:35 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 89de6dcc19fb532f5ec4f625840ba430 commit: 6feb5a12ed3b501ea5f65dad14d4026105469ad9 Author: Zac Medico gentoo org> AuthorDate: Fri Sep 2 01:43:31 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Fri Sep 2 01:43:31 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D6feb5a12 tests/emerge: enable arbitrary commands This will allow us to throw in some test commands for various helpers related to emerge (things like etc-update, dispatch-conf, quickpkg, portageq, ebuild, and emaint). --- pym/portage/tests/emerge/test_simple.py | 40 +++++++++++++++++--------= ------ 1 files changed, 22 insertions(+), 18 deletions(-) diff --git a/pym/portage/tests/emerge/test_simple.py b/pym/portage/tests/= emerge/test_simple.py index 99fc96c..9c37699 100644 --- a/pym/portage/tests/emerge/test_simple.py +++ b/pym/portage/tests/emerge/test_simple.py @@ -79,21 +79,25 @@ src_install() { }, } =20 - test_args =3D ( - ("--version",), - ("--info",), - ("--info", "--verbose"), - ("--pretend", "dev-libs/A"), - ("--pretend", "--tree", "--complete-graph", "dev-libs/A"), - ("-p", "dev-libs/B"), - ("--oneshot", "dev-libs/B",), - ("--oneshot", "dev-libs/A",), - ("--noreplace", "dev-libs/A",), - ("--pretend", "--depclean", "--verbose", "dev-libs/B"), - ("--pretend", "--depclean",), - ("--depclean",), - ("--unmerge", "--quiet", "dev-libs/A"), - ("-C", "--quiet", "dev-libs/B"), + portage_python =3D portage._python_interpreter + emerge_cmd =3D (portage_python, "-Wd", + os.path.join(PORTAGE_BIN_PATH, "emerge")) + + test_commands =3D ( + emerge_cmd + ("--version",), + emerge_cmd + ("--info",), + emerge_cmd + ("--info", "--verbose"), + emerge_cmd + ("--pretend", "dev-libs/A"), + emerge_cmd + ("--pretend", "--tree", "--complete-graph", "dev-libs/A"= ), + emerge_cmd + ("-p", "dev-libs/B"), + emerge_cmd + ("--oneshot", "dev-libs/B",), + emerge_cmd + ("--oneshot", "dev-libs/A",), + emerge_cmd + ("--noreplace", "dev-libs/A",), + emerge_cmd + ("--pretend", "--depclean", "--verbose", "dev-libs/B"), + emerge_cmd + ("--pretend", "--depclean",), + emerge_cmd + ("--depclean",), + emerge_cmd + ("--unmerge", "--quiet", "dev-libs/A"), + emerge_cmd + ("-C", "--quiet", "dev-libs/B"), ) =20 playground =3D ResolverPlayground(ebuilds=3Debuilds, installed=3Dinsta= lled) @@ -137,6 +141,7 @@ src_install() { "PORTAGE_GRPNAME" : os.environ["PORTAGE_GRPNAME"], "PORTAGE_INST_GID" : str(portage.data.portage_gid), "PORTAGE_INST_UID" : str(portage.data.portage_uid), + "PORTAGE_PYTHON" : portage_python, "PORTAGE_TMPDIR" : portage_tmpdir, "PORTAGE_USERNAME" : os.environ["PORTAGE_USERNAME"], "PORTDIR" : portdir, @@ -158,9 +163,8 @@ src_install() { # non-empty system set keeps --depclean quiet with open(os.path.join(profile_path, "packages"), 'w') as f: f.write("*dev-libs/token-system-pkg") - for args in test_args: - proc =3D subprocess.Popen([portage._python_interpreter, "-Wd", - os.path.join(PORTAGE_BIN_PATH, "emerge")] + list(args), + for args in test_commands: + proc =3D subprocess.Popen(args, env=3Denv, stdout=3Dsubprocess.PIPE) output =3D proc.stdout.readlines() proc.wait()