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 1RCeqS-0007ez-VM for garchives@archives.gentoo.org; Sat, 08 Oct 2011 21:54:13 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EF9A421C053; Sat, 8 Oct 2011 21:54:05 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id C38BB21C053 for ; Sat, 8 Oct 2011 21:54:05 +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 43B471B402F for ; Sat, 8 Oct 2011 21:54:05 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 9B6F680042 for ; Sat, 8 Oct 2011 21:54:04 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <5dbf25fc1ff3d951f3936662283c37a03afce4ca.vapier@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/tests/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/tests/__init__.py X-VCS-Directories: pym/portage/tests/ X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: 5dbf25fc1ff3d951f3936662283c37a03afce4ca Date: Sat, 8 Oct 2011 21:54:04 +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: edf01b958744c3144e491dabea419b9b commit: 5dbf25fc1ff3d951f3936662283c37a03afce4ca Author: Mike Frysinger gentoo org> AuthorDate: Sat Oct 8 21:53:34 2011 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Sat Oct 8 21:53:59 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D5dbf25fc tests: fix whitespace to be consistent Signed-off-by: Mike Frysinger gentoo.org> --- pym/portage/tests/__init__.py | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pym/portage/tests/__init__.py b/pym/portage/tests/__init__.p= y index dcf73ba..3897aba 100644 --- a/pym/portage/tests/__init__.py +++ b/pym/portage/tests/__init__.py @@ -27,7 +27,7 @@ def main(): suite.addTests(getTestFromCommandLine(sys.argv[1:], basedir)) return TextTestRunner(verbosity=3D2).run(suite) =20 - # the os.walk help mentions relative paths as being quirky + # the os.walk help mentions relative paths as being quirky # I was tired of adding dirs to the list, so now we add __test__ # to each dir we want tested. for root, dirs, files in os.walk(basedir): @@ -206,21 +206,21 @@ class TestCase(unittest.TestCase): unexpected exception. """ try: - callableObj(*args, **kwargs) + callableObj(*args, **kwargs) except excClass: - return + return else: - if hasattr(excClass,'__name__'): excName =3D excClass.__name__ - else: excName =3D str(excClass) - raise self.failureException("%s not raised: %s" % (excName, msg)) - =09 + if hasattr(excClass,'__name__'): excName =3D excClass.__name__ + else: excName =3D str(excClass) + raise self.failureException("%s not raised: %s" % (excName, msg)) + class TextTestRunner(unittest.TextTestRunner): """ We subclass unittest.TextTestRunner to output SKIP for tests that fail = but are skippable """ -=09 + def _makeResult(self): - return TextTestResult(self.stream, self.descriptions, self.verb= osity) + return TextTestResult(self.stream, self.descriptions, self.verbosity) =20 def run(self, test): """ @@ -250,7 +250,7 @@ class TextTestRunner(unittest.TextTestRunner): else: self.stream.writeln("OK") return result -=09 + test_cps =3D ['sys-apps/portage','virtual/portage'] test_versions =3D ['1.0', '1.0-r1','2.3_p4','1.0_alpha57'] test_slots =3D [ None, '1','gentoo-sources-2.6.17','spankywashere']