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 1Qkzo7-0000hH-Dj for garchives@archives.gentoo.org; Sun, 24 Jul 2011 14:37:27 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 40E9521C103; Sun, 24 Jul 2011 14:37:20 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 0685C21C103 for ; Sun, 24 Jul 2011 14:37:19 +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 7DABF1B4010 for ; Sun, 24 Jul 2011 14:37:19 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 8542580042 for ; Sun, 24 Jul 2011 14:37:18 +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/__init__.py pmstestsuite/library/standard/eclass_depend.py 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: bb9e1994f1fc44007a8954c68bf1d2f32f8f6be7 Date: Sun, 24 Jul 2011 14:37:18 +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: 88de91491fd74b3210636a68026a1d04 commit: bb9e1994f1fc44007a8954c68bf1d2f32f8f6be7 Author: Micha=C5=82 G=C3=B3rny gentoo org> AuthorDate: Sun Jul 24 14:37:41 2011 +0000 Commit: Micha=C5=82 G=C3=B3rny gentoo org> CommitDate: Sun Jul 24 14:38:22 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/pms-test-suit= e.git;a=3Dcommit;h=3Dbb9e1994 Transform eclass *DEPEND test into EclassDependencyTestCases. This way, they don't rely on metadata access anymore. --- pmstestsuite/library/standard/__init__.py | 6 ++-- pmstestsuite/library/standard/eclass_depend.py | 41 ++++++++++++++++= ++++++ pmstestsuite/library/standard/eclass_metadata.py | 16 -------- 3 files changed, 44 insertions(+), 19 deletions(-) diff --git a/pmstestsuite/library/standard/__init__.py b/pmstestsuite/lib= rary/standard/__init__.py index 1e13811..e90726c 100644 --- a/pmstestsuite/library/standard/__init__.py +++ b/pmstestsuite/library/standard/__init__.py @@ -22,10 +22,10 @@ class StandardTestLibrary(TestLibrary): 'depend.FailingRDependTest', 'deprecated_vars.AATest', 'deprecated_vars.KVTest', + 'eclass_depend.DependInheritanceTest', + 'eclass_depend.RDependInheritanceTest', + 'eclass_depend.PDependInheritanceTest', 'eclass_metadata.IUseInheritanceTest', - 'eclass_metadata.DependInheritanceTest', - 'eclass_metadata.RDependInheritanceTest', - 'eclass_metadata.PDependInheritanceTest', 'special_vars.InheritedVariableTest', 'special_vars.RDependFallbackTest', 'special_vars.DefinedPhasesTest', diff --git a/pmstestsuite/library/standard/eclass_depend.py b/pmstestsuit= e/library/standard/eclass_depend.py new file mode 100644 index 0000000..5a43402 --- /dev/null +++ b/pmstestsuite/library/standard/eclass_depend.py @@ -0,0 +1,41 @@ +# vim:fileencoding=3Dutf-8 +# (c) 2011 Micha=C5=82 G=C3=B3rny +# Released under the terms of the 2-clause BSD license. + +from pmstestsuite.library.standard.dbus_case import DBusEclassDependency= TestCase +from pmstestsuite.library.standard.util import EbuildToucher + +class DependInheritanceTest(DBusEclassDependencyTestCase): + """ DEPEND variable inheritance test. """ + + depend_classes =3D [EbuildToucher] + eclass_depend_classes =3D [EbuildToucher] + eclass_contents =3D '' + + def __init__(self, *args, **kwargs): + DBusEclassDependencyTestCase.__init__(self, *args, **kwargs) + self.phase_funcs['src_compile'].extend(( + 'pms-test-suite-%s || die' % self.dependant_ebuilds[0].pv, + 'pms-test-suite-%s || die' % self.dependant_ebuilds[1].pv + )) + +class RDependInheritanceTest(DBusEclassDependencyTestCase): + """ RDEPEND variable inheritance test. """ + + rdepend_classes =3D [EbuildToucher] + eclass_rdepend_classes =3D [EbuildToucher] + eclass_contents =3D '' + + def __init__(self, *args, **kwargs): + DBusEclassDependencyTestCase.__init__(self, *args, **kwargs) + self.phase_funcs['pkg_postinst'].extend(( + 'pms-test-suite-%s || die' % self.dependant_ebuilds[0].pv, + 'pms-test-suite-%s || die' % self.dependant_ebuilds[1].pv + )) + +class PDependInheritanceTest(DBusEclassDependencyTestCase): + """ PDEPEND variable inheritance test. """ + + pdepend_classes =3D [EbuildToucher] + eclass_pdepend_classes =3D [EbuildToucher] + eclass_contents =3D '' diff --git a/pmstestsuite/library/standard/eclass_metadata.py b/pmstestsu= ite/library/standard/eclass_metadata.py index 18e9f64..4ab4df1 100644 --- a/pmstestsuite/library/standard/eclass_metadata.py +++ b/pmstestsuite/library/standard/eclass_metadata.py @@ -49,20 +49,4 @@ class IUseInheritanceTest(VariableInheritanceTest): var_eclass_value =3D 'foo' var_ebuild_value =3D 'bar' =20 -class DependInheritanceTest(VariableInheritanceTest): - """ DEPEND variable inheritance test. """ - - var_name =3D 'DEPEND' - # XXX - var_eclass_value =3D 'sys-apps/coreutils' - var_ebuild_value =3D 'sys-libs/zlib' - -class RDependInheritanceTest(DependInheritanceTest): - """ RDEPEND variable inheritance test. """ - var_name =3D 'RDEPEND' - -class PDependInheritanceTest(DependInheritanceTest): - """ PDEPEND variable inheritance test. """ - var_name =3D 'PDEPEND' - # XXX: REQUIRED_USE