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

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

commit:     88002986eaf6c7ebc9a01dbb5904661c78efb628
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 16 17:22:38 2011 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jun 16 17:22:38 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/pms-test-suite.git;a=commit;h=88002986

Move package limiting to PackageManager.

---
 PMSTestSuite/cli.py         |   18 ++----------------
 PMSTestSuite/pm/__init__.py |   13 ++++++++++++-
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/PMSTestSuite/cli.py b/PMSTestSuite/cli.py
index 6975bfe..4b08bb8 100644
--- a/PMSTestSuite/cli.py
+++ b/PMSTestSuite/cli.py
@@ -132,23 +132,10 @@ class PMSTestSuiteCLI(object):
 		self.ret = 0 if not failed else 1
 		self.loop.quit()
 
-	def merge_done(self):
-		if self.package_queue:
-			self.start_pm()
-		else:
-			self.tests_done()
-
 	def start_pm(self):
 		print('-> Running PM...')
-		if self.limit_packages:
-			pkgs = self.package_queue[:self.limit_packages]
-			del self.package_queue[:self.limit_packages]
-		else:
-			pkgs = self.package_queue
-			self.package_queue = []
-
-		self.pm.merge(pkgs)
-		self.pm.commit(self.merge_done)
+		self.pm.merge(self.package_queue)
+		self.pm.commit(self.tests_done)
 
 	def pre_unmerge_done(self):
 		installedcpvs = self.pm.lookup_vardb(self.cpvs)
@@ -176,7 +163,6 @@ class PMSTestSuiteCLI(object):
 		self.cpvs = [t.cpv for t in self.test_library]
 
 		self.package_queue = list(self.cpvs)
-		self.limit_packages = self.pm.package_limit
 
 		installedcpvs = self.pm.lookup_vardb(self.cpvs)
 		if installedcpvs:

diff --git a/PMSTestSuite/pm/__init__.py b/PMSTestSuite/pm/__init__.py
index 588f308..02e9016 100644
--- a/PMSTestSuite/pm/__init__.py
+++ b/PMSTestSuite/pm/__init__.py
@@ -124,6 +124,12 @@ class PackageManager(object):
 
 	def _subprocess_done(self, pid, exitcode, callback):
 		assert(pid == self._curr_pid)
+
+		if self.op == PackageManagerOps.merge:
+			if self.package_limit and self.pkg_queue:
+				self.commit(callback)
+				return
+
 		del self.op
 		callback()
 
@@ -134,7 +140,12 @@ class PackageManager(object):
 		"""
 
 		if self.op == PackageManagerOps.merge:
-			subp = self._spawn_merge(self.pkg_queue)
+			if self.package_limit:
+				pkgs = self.pkg_queue[:self.package_limit]
+				del self.pkg_queue[:self.package_limit]
+			else:
+				pkgs = self.pkg_queue
+			subp = self._spawn_merge(pkgs)
 		elif self.op == PackageManagerOps.unmerge:
 			subp = self._spawn_unmerge(self.pkg_queue)
 		else: