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 1QXa2Q-0002sk-9d for garchives@archives.gentoo.org; Fri, 17 Jun 2011 14:28:46 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0561D1C0C9; Fri, 17 Jun 2011 14:28:38 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id BBC831C0C9 for ; Fri, 17 Jun 2011 14:28:38 +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 530461BC01E for ; Fri, 17 Jun 2011 14:28:38 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 4C08F8004B for ; Fri, 17 Jun 2011 14:28:37 +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/depend.py PMSTestSuite/library/standard/util.py X-VCS-Directories: PMSTestSuite/library/standard/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: a9365d9a4d98f356ac4ff057456ebc907ff5983f Date: Fri, 17 Jun 2011 14:28:37 +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: c755babd67ca7b45188ef8d0acbf9226 commit: a9365d9a4d98f356ac4ff057456ebc907ff5983f Author: Micha=C5=82 G=C3=B3rny gentoo org> AuthorDate: Fri Jun 17 14:28:55 2011 +0000 Commit: Micha=C5=82 G=C3=B3rny gentoo org> CommitDate: Fri Jun 17 14:28:55 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/pms-test-suit= e.git;a=3Dcommit;h=3Da9365d9a Add a test for dependency failure handling. --- PMSTestSuite/library/standard/__init__.py | 4 +++- PMSTestSuite/library/standard/depend.py | 16 +++++++++++++++- PMSTestSuite/library/standard/util.py | 12 ++++++++++++ 3 files changed, 30 insertions(+), 2 deletions(-) diff --git a/PMSTestSuite/library/standard/__init__.py b/PMSTestSuite/lib= rary/standard/__init__.py index 143f9c9..cd1cf75 100644 --- a/PMSTestSuite/library/standard/__init__.py +++ b/PMSTestSuite/library/standard/__init__.py @@ -16,7 +16,9 @@ class StandardTestLibrary(TestLibrary): 'phase_function_order.PhaseFunctionOrderTest', 'doins_fail.DoInsFailureTest', 'depend.DependTest', - 'depend.RDependTest' + 'depend.RDependTest', + 'depend.FailingDependTest', + 'depend.FailingRDependTest' ] =20 def get_common_files(self): diff --git a/PMSTestSuite/library/standard/depend.py b/PMSTestSuite/libra= ry/standard/depend.py index cdd95ed..77e2938 100644 --- a/PMSTestSuite/library/standard/depend.py +++ b/PMSTestSuite/library/standard/depend.py @@ -3,7 +3,7 @@ # Released under the terms of the 2-clause BSD license. =20 from PMSTestSuite.library.standard.dbus_case import DBusEbuildDependency= TestCase -from PMSTestSuite.library.standard.util import EbuildToucher +from PMSTestSuite.library.standard.util import EbuildToucher, FailingEbu= ild =20 class DependTest(DBusEbuildDependencyTestCase): """ DEPEND fulfilling test. """ @@ -28,3 +28,17 @@ class RDependTest(DBusEbuildDependencyTestCase): self.phase_funcs['pkg_postinst'].append( 'pms-test-suite-%s || die' % self.rdepend_objs[0].pv ) + +class FailingDependTest(DBusEbuildDependencyTestCase): + """ Unfulfilled DEPEND test. """ + + relevant_eapis =3D (0,) + depend_classes =3D [FailingEbuild] + expect_failure =3D True + +class FailingRDependTest(DBusEbuildDependencyTestCase): + """ Unfulfilled RDEPEND test. """ + + relevant_eapis =3D (0,) + depend_classes =3D [FailingEbuild] + expect_failure =3D True diff --git a/PMSTestSuite/library/standard/util.py b/PMSTestSuite/library= /standard/util.py index f1e9ad7..f0c4c32 100644 --- a/PMSTestSuite/library/standard/util.py +++ b/PMSTestSuite/library/standard/util.py @@ -22,3 +22,15 @@ _EOF_''' self.phase_funcs['src_install'].append( 'newbin mytrue.sh pms-test-suite-%s || die' % self.pv ) + +class FailingEbuild(DBusEbuildTestCase): + """ A failing ebuild. """ + + phase_funcs =3D { + 'src_unpack': ['die'] + } + expect_failure =3D True + + @property + def pv(self): + return id(self)