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 1Ri8V6-0004yS-1o for garchives@archives.gentoo.org; Tue, 03 Jan 2012 17:50:20 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2689421C1EC; Tue, 3 Jan 2012 17:50:04 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id EBF1921C1EC for ; Tue, 3 Jan 2012 17:50:03 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6AB371B4010 for ; Tue, 3 Jan 2012 17:50:03 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 5C8578004F for ; Tue, 3 Jan 2012 17:50:02 +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: <980fe4c9237ff98ba4cb165854831d56b2ffc39c.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/banned_commands.py X-VCS-Directories: pmstestsuite/library/standard/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 980fe4c9237ff98ba4cb165854831d56b2ffc39c Date: Tue, 3 Jan 2012 17:50:02 +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: 11cf5966-94be-495e-bd9d-2da1658428ba X-Archives-Hash: 1cf6646af9e94dc071b15aa52249b5c1 commit: 980fe4c9237ff98ba4cb165854831d56b2ffc39c Author: Micha=C5=82 G=C3=B3rny gentoo org> AuthorDate: Tue Jan 3 17:07:03 2012 +0000 Commit: Micha=C5=82 G=C3=B3rny gentoo org> CommitDate: Tue Jan 3 17:07:03 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/pms-test-suit= e.git;a=3Dcommit;h=3D980fe4c9 Fix test code. --- pmstestsuite/library/standard/banned_commands.py | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/pmstestsuite/library/standard/banned_commands.py b/pmstestsu= ite/library/standard/banned_commands.py index 7e3de17..5ddc80f 100644 --- a/pmstestsuite/library/standard/banned_commands.py +++ b/pmstestsuite/library/standard/banned_commands.py @@ -36,12 +36,12 @@ class DoHardCommandTest(BannedCommandTest): except IndexError: res =3D None =20 + exc =3D None if self.eapi < 4: try: self.assertTrue(res, 'hardlink created') except AssertionError as e: - if exc is None: - exc =3D e + exc =3D e try: self.assertTrue(output[1] =3D=3D '0', 'hardlink preserved after merg= e', undefined =3D True) @@ -76,9 +76,6 @@ class DoSedCommandTest(BannedCommandTest): =20 if self.eapi < 4: self.assertEqual(res, 'SED WORKED', 'dosed result') - elif res is not None or exc: + elif res is not None: self.assertNotEqual(res, 'SED WORKED', 'dosed result', undefined =3D True) - - if exc: - raise exc