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

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

commit:     d35a99453c8c1ecaa7875cb22889707e18b50e55
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Aug  5 16:39:12 2011 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Aug  5 16:39:19 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/pms-test-suite.git;a=commit;h=d35a9945

Support running tests using multiple PMs.

---
 pmstestsuite/cli.py |   38 ++++++++++++++++++++++++--------------
 1 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/pmstestsuite/cli.py b/pmstestsuite/cli.py
index fa91900..adf341e 100644
--- a/pmstestsuite/cli.py
+++ b/pmstestsuite/cli.py
@@ -160,9 +160,10 @@ class PMSTestSuiteCLI(object):
 			self.test_library.limit_tests(limit_tests)
 
 	def _print_stage(self, text):
-		print('-> %s...' % text)
+		print('-> [%s] %s...' % (self.pm.name, text))
 
 	def tests_done(self):
+		self.pm.reload_config()
 		self._print_stage('Checking test results')
 		self.results = {}
 		for t in self.test_library:
@@ -181,11 +182,13 @@ class PMSTestSuiteCLI(object):
 
 		if self.pm.has_pending_actions:
 			self._print_stage('Unmerging test ebuilds')
-			self.pm.commit(self.all_done)
+			self.pm.commit(self.prepare)
 		else:
-			self.all_done()
+			self.prepare()
 
 	def all_done(self):
+		if len(self.pms) > 1:
+			raise NotImplementedError('Running multiple PMs not implemented yet.')
 		ret = self.output(self.results, verbose = self.verbose)
 
 		self.ret = 0 if ret else 1
@@ -198,6 +201,7 @@ class PMSTestSuiteCLI(object):
 		self.pm.commit(self.tests_done)
 
 	def pre_unmerge_done(self):
+		self.pm.reload_config()
 		for t in self.test_library:
 			t.clean(self.pm)
 		if self.pm.has_pending_actions:
@@ -208,15 +212,22 @@ class PMSTestSuiteCLI(object):
 			return
 		self.start_pm()
 
-	def prepare(self):
-		for t in self.test_library:
-			t.clean(self.pm)
-
-		if self.pm.has_pending_actions:
-			self._print_stage('Unmerging already-merged test ebuilds')
-			self.pm.commit(self.pre_unmerge_done)
+	def prepare(self, first = False):
+		try:
+			self.pm = next(self.pm_iter)
+		except StopIteration:
+			self.all_done()
 		else:
-			self.start_pm()
+			if not first:
+				self.pm.reload_config()
+			for t in self.test_library:
+				t.clean(self.pm)
+
+			if self.pm.has_pending_actions:
+				print('-> Unmerging already-merged test ebuilds...')
+				self.pm.commit(self.pre_unmerge_done)
+			else:
+				self.start_pm()
 
 	def main(self, argv):
 		self._start(*argv)
@@ -248,9 +259,8 @@ class PMSTestSuiteCLI(object):
 					print('No PM was able to do the Manifests, failing.')
 					return 1
 
-		if len(self.pms) > 1:
-			raise NotImplementedError('Using multiple PMs not implemented yet')
-		self.prepare()
+		self.pm_iter = iter(self.pms)
+		self.prepare(first = True)
 
 		self.ret = 1
 		self.loop = gobject.MainLoop()