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

[Michał Górny]

commit:     4b45ef360b363c7fc472e6d746ee68e70ee61837
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 29 17:30:32 2011 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Jun 29 17:32:35 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/pms-test-suite.git;a=commit;h=4b45ef36

Support grabbing relevant_ and supported_eapis from a prop.

As Python doesn't supply us with class properties, we need a little
function to handle transforming them as necessary. Hopefully it won't be
an ugly hack as it uses the property object public API.

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

diff --git a/pmstestsuite/library/case.py b/pmstestsuite/library/case.py
index e87f15d..3ab5197 100644
--- a/pmstestsuite/library/case.py
+++ b/pmstestsuite/library/case.py
@@ -114,8 +114,20 @@ class EbuildTestCase(TestCase):
 	inherits = []
 	phase_funcs = {}
 
+	@classmethod
+	def _eval_prop(cls, prop_or_obj):
+		"""
+		Evaluate and return the value of a property when passed a property
+		object, or return the passed value otherwise.
+		"""
+
+		if isinstance(prop_or_obj, property):
+			return prop_or_obj.fget(cls)
+		else:
+			return prop_or_obj
+
 	@property
-	def supported_eapis(self):
+	def supported_eapis(cls):
 		"""
 		A list of EAPIs for which the test is able to run and gives
 		predictible results. Defaults to all available EAPIs.
@@ -126,7 +138,7 @@ class EbuildTestCase(TestCase):
 		return (0, 1, 2, 3, 4)
 
 	@property
-	def relevant_eapis(self):
+	def relevant_eapis(cls):
 		"""
 		A list of EAPIs for which the test should be run by default (in
 		non-thorough mode). This should list all the EAPIs where
@@ -134,7 +146,7 @@ class EbuildTestCase(TestCase):
 
 		When unset, defaults to a random element of .supported_eapis().
 		"""
-		return random.choice(self.supported_eapis)
+		return (random.choice(cls._eval_prop(cls.supported_eapis)),)
 
 	@classmethod
 	def inst_all(cls, *args, **kwargs):
@@ -143,7 +155,10 @@ class EbuildTestCase(TestCase):
 
 		Returns an iterator over a list of test case instances.
 		"""
-		for eapi in cls.relevant_eapis:
+
+		# sadly, no @classproperty
+		# but property object attributes are official
+		for eapi in cls._eval_prop(cls.relevant_eapis):
 			kwargs['eapi'] = eapi
 			yield cls(*args, **kwargs)