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

[Michał Górny]

commit:     5337c280c32ad6534c713adc5047920014c5a6a3
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun May 29 18:32:49 2011 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun May 29 18:32:49 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/pms-test-suite.git;a=commit;h=5337c280

Cache instantiated tests.

---
 PMSTestSuite/library/__init__.py |   25 +++++++++++++++++--------
 1 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/PMSTestSuite/library/__init__.py b/PMSTestSuite/library/__init__.py
index 52aa8d2..a473888 100644
--- a/PMSTestSuite/library/__init__.py
+++ b/PMSTestSuite/library/__init__.py
@@ -22,6 +22,8 @@ from PMSTestSuite.library.case import TestCase
 class TestLibrary(object):
 	""" Base class for a test library. """
 
+	tests = None
+
 	def __iter__(self):
 		"""
 		Iterate over all the tests in a test library, loading its modules
@@ -32,14 +34,21 @@ class TestLibrary(object):
 		- ImportError if submodule import fails.
 		"""
 
-		for t in self.test_names:
-			# XXX: tests without a '.' in __init__?
-			modname, clsname = t.rsplit('.', 1)
-			modname = '%s.%s' % (self.modname, modname)
-			mod = __import__(modname, {}, {}, [clsname], 0)
-			cls = getattr(mod, clsname)
-			for i in cls.inst_all():
-				yield i
+		if self.tests is not None:
+			# tests already instantiated
+			for t in self.tests:
+				yield t
+		else:
+			self.tests = []
+			for t in self.test_names:
+				# XXX: tests without a '.' in __init__?
+				modname, clsname = t.rsplit('.', 1)
+				modname = '%s.%s' % (self.modname, modname)
+				mod = __import__(modname, {}, {}, [clsname], 0)
+				cls = getattr(mod, clsname)
+				for i in cls.inst_all():
+					self.tests.append(i)
+					yield i
 
 	def __init__(self, modname):
 		self.modname = modname