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

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

commit:     d44574ba1acd5589dd1a4072bd7e01a5e171b6e9
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Aug  5 15:47:41 2011 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Aug  5 15:47:41 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/pms-test-suite.git;a=commit;h=d44574ba

Support doing the Manifests with multiple PMs.

---
 pmstestsuite/cli.py |   21 +++++++++++++++++----
 1 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/pmstestsuite/cli.py b/pmstestsuite/cli.py
index 52e14cc..607d3ce 100644
--- a/pmstestsuite/cli.py
+++ b/pmstestsuite/cli.py
@@ -127,9 +127,7 @@ class PMSTestSuiteCLI(object):
 		if pmset:
 			opt.error('PM(s) not supported: %s' % ', '.join(pmset))
 
-		self.pm = self.pms.pop()
-		if self.pms:
-			raise NotImplementedError('Using multiple PMs not implemented yet')
+		self.pm = self.pms[0]
 
 		os.umask(0o22)
 
@@ -222,7 +220,22 @@ class PMSTestSuiteCLI(object):
 
 		self.repository.write_files(files)
 		if self.update_manifests:
-			self.repository.remanifest(files, self.pm)
+			needs_manifests = False
+			for pm in self.pms:
+				needs_manifests |= pm.requires_manifests
+				try:
+					self.repository.remanifest(files, pm)
+				except NotImplementedError:
+					pass
+				else:
+					break
+			else:
+				if needs_manifests:
+					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')
 
 		for t in self.test_library:
 			t.clean(self.pm)