From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id EB86A1382C5 for ; Mon, 7 May 2018 00:27:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 62237E0969; Mon, 7 May 2018 00:27:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 40DCCE0969 for ; Mon, 7 May 2018 00:27:31 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 76448335C89 for ; Mon, 7 May 2018 00:27:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0026E3D for ; Mon, 7 May 2018 00:27:28 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1525652394.299a9a40536209c4c2664857b5aecb018fa0a6f6.zmedico@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: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 299a9a40536209c4c2664857b5aecb018fa0a6f6 X-VCS-Branch: master Date: Mon, 7 May 2018 00:27:28 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: e6a614d3-cb47-4e25-adeb-230469cbff57 X-Archives-Hash: ca4e091ef5ba3aefbfc36a452f557abc commit: 299a9a40536209c4c2664857b5aecb018fa0a6f6 Author: Zac Medico gentoo org> AuthorDate: Sun May 6 23:40:33 2018 +0000 Commit: Zac Medico gentoo org> CommitDate: Mon May 7 00:19:54 2018 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=299a9a40 TestCase: handle SkipTest during setUp method pym/portage/tests/__init__.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pym/portage/tests/__init__.py b/pym/portage/tests/__init__.py index bf681c47e..e149b5c0c 100644 --- a/pym/portage/tests/__init__.py +++ b/pym/portage/tests/__init__.py @@ -207,18 +207,18 @@ class TestCase(unittest.TestCase): result.startTest(self) testMethod = getattr(self, self._testMethodName) try: - try: - self.setUp() - except SystemExit: - raise - except KeyboardInterrupt: - raise - except: - result.addError(self, sys.exc_info()) - return - ok = False try: + try: + self.setUp() + except KeyboardInterrupt: + raise + except SkipTest: + raise + except Exception: + result.addError(self, sys.exc_info()) + return + testMethod() ok = True except SkipTest as e: