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

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

commit:     f3554b599e4f59f2c31da7057b081689a02740d4
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue May 24 07:49:23 2011 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue May 24 07:49:23 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/pms-test-suite.git;a=commit;h=f3554b59

Use a class to lazily generate ebuild contents.

---
 PMSTestSuite/library/__init__.py |    4 +++-
 PMSTestSuite/library/case.py     |   34 +++++++++++++++++++++-------------
 2 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/PMSTestSuite/library/__init__.py b/PMSTestSuite/library/__init__.py
index ba6867a..b127108 100644
--- a/PMSTestSuite/library/__init__.py
+++ b/PMSTestSuite/library/__init__.py
@@ -9,8 +9,10 @@
 >>> t = [x for x in l][0]
 >>> t # doctest: +ELLIPSIS
 <PMSTestSuite.library.test.random_test.ExampleCase object at ...>
->>> t.get_output_files() # doctest: +ELLIPSIS
+>>> files = t.get_output_files()
+>>> files # doctest: +ELLIPSIS
 {'pms-test/examplecase/examplecase-0.ebuild': ...}
+>>> f = files.values()[0]
 """
 
 from PMSTestSuite.library.case import TestCase

diff --git a/PMSTestSuite/library/case.py b/PMSTestSuite/library/case.py
index f2115e2..f6ae90b 100644
--- a/PMSTestSuite/library/case.py
+++ b/PMSTestSuite/library/case.py
@@ -27,19 +27,27 @@ class EbuildTestCase(TestCase):
 		self.eapi = eapi
 
 	def get_output_files(self):
-		pn = self.__class__.__name__.lower()
-		fn = 'pms-test/%s/%s-%s.ebuild' % (pn, pn, self.eapi)
-		contents = [ebuild_header]
+		class EbuildTestCaseEbuildFile(object):
+			def __init__(self, parent):
+				self._parent = parent
+
+			def __str__(self):
+				contents = [ebuild_header]
+
+				for k, v in self._parent.ebuild_vars.items():
+					contents.append('%s="%s"\n' % (k, v)) # XXX: escaping
 
-		for k, v in self.ebuild_vars.items():
-			contents.append('%s="%s"\n' % (k, v)) # XXX: escaping
+				for f, lines in self._parent.phase_funcs.items():
+					if f == 'pkg_setup':
+						lines.insert(0, 'pms-test_pkg_setup')
+					contents.append('\n%s() {\n' % f)
+					for l in lines:
+						contents.append('\t%s\n' % l) # XXX: smarter tabs
+					contents.append('}\n')
 
-		for f, lines in self.phase_funcs.items():
-			if f == 'pkg_setup':
-				lines.insert(0, 'pms-test_pkg_setup')
-			contents.append('\n%s() {\n' % f)
-			for l in lines:
-				contents.append('\t%s\n' % l) # XXX: smarter tabs
-			contents.append('}\n')
+				return ''.join(contents)
+
+		pn = self.__class__.__name__.lower()
+		fn = 'pms-test/%s/%s-%s.ebuild' % (pn, pn, self.eapi)
 
-		return {fn: ''.join(contents)}
+		return {fn: EbuildTestCaseEbuildFile(self)}