[gentoo-commits] proj/pms-test-suite:master commit in: pmstestsuite/library/

[Michał Górny]

commit:     6b0b371c056d926103bff2759e3e633aae778217
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  3 12:11:20 2012 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Jan  3 12:11:20 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/pms-test-suite.git;a=commit;h=6b0b371c

Proceed with output checks even if test fails to merge.

---
 pmstestsuite/library/case.py |   23 ++++++++++++++++++-----
 1 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/pmstestsuite/library/case.py b/pmstestsuite/library/case.py
index 7cf4b1c..0f63735 100644
--- a/pmstestsuite/library/case.py
+++ b/pmstestsuite/library/case.py
@@ -695,9 +695,22 @@ class EbuildTestCase(TestCase):
 		@type pm: L{PackageManager}
 		"""
 
-		merged = self.atom(pm) in pm.installed
-		self.assertBool(not self.expect_failure, merged,
-				'package merged')
-		self.assertBool(self.expect_started, self.dbus_started,
-				'build started')
+		exc = None
+
+		try:
+			merged = self.atom(pm) in pm.installed
+			self.assertBool(not self.expect_failure, merged,
+					'package merged')
+		except AssertionError as e:
+			exc = e
+
+		try:
+			self.assertBool(self.expect_started, self.dbus_started,
+					'build started')
+		except AssertionError as e:
+			exc = e
+
 		self.check_dbus_result(self._pop_dbus_output(), pm)
+
+		if exc is not None:
+			raise exc