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 1Qwpg6-0002hH-1m for garchives@archives.gentoo.org; Fri, 26 Aug 2011 06:14:06 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 08D4F21C07E; Fri, 26 Aug 2011 06:13:56 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id BFDE421C075 for ; Fri, 26 Aug 2011 06:13:56 +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 269291B4031 for ; Fri, 26 Aug 2011 06:13:56 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 7845D80040 for ; Fri, 26 Aug 2011 06:13:55 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: 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: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: ebc4f381f351f6c67dd911be1efa2df51de87f07 Date: Fri, 26 Aug 2011 06:13:55 +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: de46983a52499ebce7039b5c2145ec4e commit: ebc4f381f351f6c67dd911be1efa2df51de87f07 Author: Zac Medico gentoo org> AuthorDate: Fri Aug 26 06:07:39 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Fri Aug 26 06:07:39 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Debc4f381 Add skipped test support (for python 2.6 compat) Python supports skipped tests since 2.7, but we'll implement support ourselves for python 2.6 compatibility. This is a simple extension of the todo support that we have already implemented. --- pym/portage/tests/__init__.py | 18 +++++++++++++++++- 1 files changed, 17 insertions(+), 1 deletions(-) diff --git a/pym/portage/tests/__init__.py b/pym/portage/tests/__init__.p= y index dddf386..6f21d10 100644 --- a/pym/portage/tests/__init__.py +++ b/pym/portage/tests/__init__.py @@ -109,6 +109,7 @@ class TextTestResult(_TextTestResult): def __init__(self, stream, descriptions, verbosity): super(TextTestResult, self).__init__(stream, descriptions, verbosity) self.todoed =3D [] + self.portage_skipped =3D [] =20 def addTodo(self, test, info): self.todoed.append((test,info)) @@ -117,12 +118,20 @@ class TextTestResult(_TextTestResult): elif self.dots: self.stream.write(".") =20 + def addPortageSkip(self, test, info): + self.portage_skipped.append((test,info)) + if self.showAll: + self.stream.writeln("SKIP") + elif self.dots: + self.stream.write(".") + def printErrors(self): if self.dots or self.showAll: self.stream.writeln() self.printErrorList('ERROR', self.errors) self.printErrorList('FAIL', self.failures) self.printErrorList('TODO', self.todoed) + self.printErrorList('SKIP', self.portage_skipped) =20 class TestCase(unittest.TestCase): """ @@ -135,6 +144,7 @@ class TestCase(unittest.TestCase): def __init__(self, *pargs, **kwargs): unittest.TestCase.__init__(self, *pargs, **kwargs) self.todo =3D False + self.portage_skip =3D None =20 def defaultTestResult(self): return TextTestResult() @@ -158,7 +168,13 @@ class TestCase(unittest.TestCase): testMethod() ok =3D True except self.failureException: - if self.todo: + if self.portage_skip is not None: + if self.portage_skip is True: + result.addPortageSkip(self, "%s: SKIP" % testMethod) + else: + result.addPortageSkip(self, "%s: SKIP: %s" % + (testMethod, self.portage_skip)) + elif self.todo: result.addTodo(self,"%s: TODO" % testMethod) else: result.addFailure(self, sys.exc_info())