public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Zac Medico" <zmedico@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/tests/
Date: Mon,  7 May 2018 00:27:28 +0000 (UTC)	[thread overview]
Message-ID: <1525652394.299a9a40536209c4c2664857b5aecb018fa0a6f6.zmedico@gentoo> (raw)

commit:     299a9a40536209c4c2664857b5aecb018fa0a6f6
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sun May  6 23:40:33 2018 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> 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:


             reply	other threads:[~2018-05-07  0:27 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-05-07  0:27 Zac Medico [this message]
  -- strict thread matches above, loose matches on Subject: below --
2014-09-29 22:27 [gentoo-commits] proj/portage:master commit in: pym/portage/tests/ Brian Dolbec
2013-10-21  2:20 Mike Frysinger
2013-10-17  7:31 Mike Frysinger
2013-08-03  1:37 Zac Medico
2013-03-19  8:36 Zac Medico
2013-03-13  4:10 Arfrever Frehtes Taifersar Arahesis
2013-01-31 19:56 Zac Medico
2013-01-03 23:31 Zac Medico
2011-12-16  2:42 Zac Medico
2011-10-10  2:22 Zac Medico
2011-10-10  1:55 Zac Medico
2011-10-09 20:41 Mike Frysinger
2011-10-09 20:41 Mike Frysinger
2011-10-09 20:41 Mike Frysinger
2011-10-08 21:54 Mike Frysinger
2011-08-29  2:59 Zac Medico
2011-08-26  6:13 Zac Medico
2011-08-25 21:54 Zac Medico

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1525652394.299a9a40536209c4c2664857b5aecb018fa0a6f6.zmedico@gentoo \
    --to=zmedico@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox