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

[Michał Górny]

commit:     6ae2cc8860a8e9f637c01a727fdeba582b878c78
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Aug  3 08:09:38 2011 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Aug  3 08:09:38 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/pms-test-suite.git;a=commit;h=6ae2cc88

Migrate most of the tests to use assertions.

---
 pmstestsuite/library/standard/eclass_metadata.py   |   13 +++----
 .../library/standard/phase_function_order.py       |    4 +-
 pmstestsuite/library/standard/special_vars.py      |   33 ++++++++++---------
 3 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/pmstestsuite/library/standard/eclass_metadata.py b/pmstestsuite/library/standard/eclass_metadata.py
index 4e5ed15..1ebc05e 100644
--- a/pmstestsuite/library/standard/eclass_metadata.py
+++ b/pmstestsuite/library/standard/eclass_metadata.py
@@ -41,12 +41,11 @@ class IUseInheritanceTest(VariableInheritanceTest):
 
 	def check_dbus_result(self, output, pm):
 		# ensure it got installed first
-		if not DBusEclassTestCase.check_dbus_result(self, output, pm):
-			return False
+		DBusEclassTestCase.check_dbus_result(self, output, pm)
 
 		spl = pm.installed[self.atom(pm)].use
-		return self.var_eclass_value in spl \
-				and self.var_ebuild_value in spl
+		self.assertEqual(sorted(spl), sorted((self.var_eclass_value,
+				self.var_ebuild_value)), 'IUSE')
 
 # XXX: REQUIRED_USE
 
@@ -71,8 +70,8 @@ EXPORT_FUNCTIONS src_compile
 ''' % self.pn
 
 	def check_dbus_result(self, output, pm):
-		if not DBusEclassTestCase.check_dbus_result(self, output, pm):
-			return False
+		DBusEclassTestCase.check_dbus_result(self, output, pm)
 
 		phases = pm.installed[self.atom(pm)].defined_phases
-		return (sorted(phases) == ['compile', 'setup'])
+		self.assertEqual(sorted(phases), ['compile', 'setup'],
+				'DEFINED_PHASES')

diff --git a/pmstestsuite/library/standard/phase_function_order.py b/pmstestsuite/library/standard/phase_function_order.py
index ce7f03f..65209ce 100644
--- a/pmstestsuite/library/standard/phase_function_order.py
+++ b/pmstestsuite/library/standard/phase_function_order.py
@@ -42,5 +42,5 @@ src_install
 pkg_preinst
 pkg_postinst"""
 
-		return (output == expect) \
-				and DBusEbuildTestCase.check_dbus_result(self, output, pm)
+		DBusEbuildTestCase.check_dbus_result(self, output, pm)
+		self.assertEqual(output, expect, 'Executed phases')

diff --git a/pmstestsuite/library/standard/special_vars.py b/pmstestsuite/library/standard/special_vars.py
index eab61dc..854a196 100644
--- a/pmstestsuite/library/standard/special_vars.py
+++ b/pmstestsuite/library/standard/special_vars.py
@@ -14,9 +14,10 @@ class InheritedVariableTest(DBusEbuildTestCase):
 	}
 
 	def check_dbus_result(self, output, pm):
+		DBusEbuildTestCase.check_dbus_result(self, output, pm)
 		inherits = output.split()
-		return 'pms-test-dbus' in inherits \
-			and DBusEbuildTestCase.check_dbus_result(self, output, pm)
+		self.assertContains('pms-test-dbus', inherits,
+				'INHERITS')
 
 class RDependFallbackTest(DBusEbuildTestCase):
 	""" Test whether RDEPEND=${DEPEND} fallback works as expected. """
@@ -28,20 +29,21 @@ class RDependFallbackTest(DBusEbuildTestCase):
 	}
 
 	def check_dbus_result(self, output, pm):
-		# in EAPI 4, expect empty RDEPEND
-		# in older EAPIs, expect DEPEND
-
-		if not DBusEbuildTestCase.check_dbus_result(self, output, pm):
-			return False
+		DBusEbuildTestCase.check_dbus_result(self, output, pm)
 
-		def _has_our_pkg(deps):
-			for d in deps:
-				if d.key == 'virtual/libc':
-					return True
-			return False
+		class DepMatcher(object):
+			def __eq__(self, other):
+				return other.key == 'virtual/libc'
 
 		rdep = pm.installed[self.atom(pm)].run_dependencies
-		return ((self.eapi == 4) != _has_our_pkg(rdep))
+		mydep = DepMatcher()
+
+		# in EAPI 4, expect empty RDEPEND
+		# in older EAPIs, expect == DEPEND
+		if self.eapi == 4:
+			self.assertEqual(tuple(rdep), (), 'RDEPEND')
+		else:
+			self.assertContains(mydep, rdep, 'RDEPEND')
 
 class DefinedPhasesTest(DBusEbuildTestCase):
 	""" Test whether DEFINED_PHASES are declared in EAPI 4. """
@@ -54,8 +56,7 @@ class DefinedPhasesTest(DBusEbuildTestCase):
 	}
 
 	def check_dbus_result(self, output, pm):
-		if not DBusEbuildTestCase.check_dbus_result(self, output, pm):
-			return False
+		DBusEbuildTestCase.check_dbus_result(self, output, pm)
 
 		phases = pm.installed[self.atom(pm)].defined_phases
-		return (str(phases) == 'setup')
+		self.assertEqual(tuple(phases), ('setup',), 'DEFINED_PHASES')