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 1QihNQ-000540-KD for garchives@archives.gentoo.org; Mon, 18 Jul 2011 06:32:24 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B2A8321C311; Mon, 18 Jul 2011 06:32:12 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 8529421C311 for ; Mon, 18 Jul 2011 06:32:12 +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 0DA6B1B400A for ; Mon, 18 Jul 2011 06:32:12 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id D872F80042 for ; Mon, 18 Jul 2011 06:32:10 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: Subject: [gentoo-commits] proj/pms-test-suite:master commit in: pmstestsuite/library/standard/ X-VCS-Repository: proj/pms-test-suite X-VCS-Files: pmstestsuite/library/standard/special_vars.py X-VCS-Directories: pmstestsuite/library/standard/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: b3c40c38de700267a5b8fcd26ef7952b6eb5828c Date: Mon, 18 Jul 2011 06:32:10 +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: 73cd9925d68f6ae80e36de533767f223 commit: b3c40c38de700267a5b8fcd26ef7952b6eb5828c Author: Micha=C5=82 G=C3=B3rny gentoo org> AuthorDate: Mon Jul 18 06:32:44 2011 +0000 Commit: Micha=C5=82 G=C3=B3rny gentoo org> CommitDate: Mon Jul 18 06:33:07 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/pms-test-suit= e.git;a=3Dcommit;h=3Db3c40c38 Check if an ebuild was installed before getting its metadata. --- pmstestsuite/library/standard/special_vars.py | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/pmstestsuite/library/standard/special_vars.py b/pmstestsuite= /library/standard/special_vars.py index c74c16d..3b3afba 100644 --- a/pmstestsuite/library/standard/special_vars.py +++ b/pmstestsuite/library/standard/special_vars.py @@ -31,9 +31,11 @@ class RDependFallbackTest(DBusEbuildTestCase): # in EAPI 4, expect empty RDEPEND # in older EAPIs, expect DEPEND =20 + if not DBusEbuildTestCase.check_dbus_result(self, output, pm): + return False + meta =3D pm.installed[self.atom(pm)].metadata - return ((self.eapi =3D=3D 4) !=3D ('virtual/libc' in meta.RDEPEND.spli= t())) \ - and DBusEbuildTestCase.check_dbus_result(self, output, pm) + return ((self.eapi =3D=3D 4) !=3D ('virtual/libc' in meta.RDEPEND.spli= t())) =20 class DefinedPhasesTest(DBusEbuildTestCase): """ Test whether DEFINED_PHASES are declared in EAPI 4. """ @@ -46,6 +48,8 @@ class DefinedPhasesTest(DBusEbuildTestCase): } =20 def check_dbus_result(self, output, pm): + if not DBusEbuildTestCase.check_dbus_result(self, output, pm): + return False + phases =3D pm.installed[self.atom(pm)].metadata.DEFINED_PHASES.split() - return (' '.join(phases) =3D=3D 'setup') \ - and DBusEbuildTestCase.check_dbus_result(self, output, pm) + return (' '.join(phases) =3D=3D 'setup')