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 1Qq4ni-0007k0-4b for garchives@archives.gentoo.org; Sun, 07 Aug 2011 14:58:02 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3DD2821C310; Sun, 7 Aug 2011 14:57:45 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 1384F21C310 for ; Sun, 7 Aug 2011 14:57:45 +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 ECDFF656D9 for ; Sun, 7 Aug 2011 14:57:43 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 0B45E80040 for ; Sun, 7 Aug 2011 14:57:43 +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: <3ce68ad83ba002bac60ea195d51a1cea7effcc27.mgorny@gentoo> 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/eclass_metadata.py X-VCS-Directories: pmstestsuite/library/standard/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 3ce68ad83ba002bac60ea195d51a1cea7effcc27 Date: Sun, 7 Aug 2011 14:57:43 +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: 6d03336340469233cf5550525fc34f84 commit: 3ce68ad83ba002bac60ea195d51a1cea7effcc27 Author: Micha=C5=82 G=C3=B3rny gentoo org> AuthorDate: Sun Aug 7 14:56:57 2011 +0000 Commit: Micha=C5=82 G=C3=B3rny gentoo org> CommitDate: Sun Aug 7 14:56:57 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/pms-test-suit= e.git;a=3Dcommit;h=3D3ce68ad8 Metadata inheritance checks: be more clean which val comes from eclass. --- pmstestsuite/library/standard/eclass_metadata.py | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pmstestsuite/library/standard/eclass_metadata.py b/pmstestsu= ite/library/standard/eclass_metadata.py index 225e1d3..08e1b55 100644 --- a/pmstestsuite/library/standard/eclass_metadata.py +++ b/pmstestsuite/library/standard/eclass_metadata.py @@ -44,8 +44,8 @@ class IUseInheritanceTest(VariableInheritanceTest): DBusEclassTestCase.check_dbus_result(self, output, pm) =20 spl =3D pm.installed[self.atom(pm)].use - self.assertEqual(sorted([str(x) for x in spl]), sorted((self.var_eclas= s_value, - self.var_ebuild_value)), 'IUSE') + self.assertContains(self.var_eclass_value, spl, 'IUSE (eclass)') + self.assertContains(self.var_ebuild_value, spl, 'IUSE (ebuild)') =20 # XXX: REQUIRED_USE =20 @@ -54,7 +54,7 @@ class EclassDefinedPhasesTest(DBusEclassTestCase): =20 supported_eapis =3D ((4,),) phase_funcs =3D { - 'pkg_setup': [ + 'src_install': [ ':' ] } @@ -73,5 +73,5 @@ EXPORT_FUNCTIONS src_compile DBusEclassTestCase.check_dbus_result(self, output, pm) =20 phases =3D pm.installed[self.atom(pm)].defined_phases - self.assertEqual(sorted(phases), ['compile', 'setup'], - 'DEFINED_PHASES') + self.assertContains('compile', phases, 'DEFINED_PHASES (eclass)') + self.assertContains('install', phases, 'DEFINED_PHASES (ebuild)')