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

["Michał Górny" <mgorny@gentoo.org>]

commit:     3ce68ad83ba002bac60ea195d51a1cea7effcc27
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Aug  7 14:56:57 2011 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Aug  7 14:56:57 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/pms-test-suite.git;a=commit;h=3ce68ad8

Metadata inheritance checks: be more clean which val comes from eclass.

---
 pmstestsuite/library/standard/eclass_metadata.py |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pmstestsuite/library/standard/eclass_metadata.py b/pmstestsuite/library/standard/eclass_metadata.py
index 225e1d3..08e1b55 100644
--- a/pmstestsuite/library/standard/eclass_metadata.py
+++ b/pmstestsuite/library/standard/eclass_metadata.py
@@ -44,8 +44,8 @@ class IUseInheritanceTest(VariableInheritanceTest):
 		DBusEclassTestCase.check_dbus_result(self, output, pm)
 
 		spl = pm.installed[self.atom(pm)].use
-		self.assertEqual(sorted([str(x) for x in spl]), sorted((self.var_eclass_value,
-				self.var_ebuild_value)), 'IUSE')
+		self.assertContains(self.var_eclass_value, spl, 'IUSE (eclass)')
+		self.assertContains(self.var_ebuild_value, spl, 'IUSE (ebuild)')
 
 # XXX: REQUIRED_USE
 
@@ -54,7 +54,7 @@ class EclassDefinedPhasesTest(DBusEclassTestCase):
 
 	supported_eapis = ((4,),)
 	phase_funcs = {
-		'pkg_setup': [
+		'src_install': [
 			':'
 		]
 	}
@@ -73,5 +73,5 @@ EXPORT_FUNCTIONS src_compile
 		DBusEclassTestCase.check_dbus_result(self, output, pm)
 
 		phases = pm.installed[self.atom(pm)].defined_phases
-		self.assertEqual(sorted(phases), ['compile', 'setup'],
-				'DEFINED_PHASES')
+		self.assertContains('compile', phases, 'DEFINED_PHASES (eclass)')
+		self.assertContains('install', phases, 'DEFINED_PHASES (ebuild)')