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

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

commit:     bf3905892670dd294eb8ae5680920b09d1c77230
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue May 31 11:44:32 2011 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue May 31 11:44:32 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/pms-test-suite.git;a=commit;h=bf390589

Pass cpvs to PM.merge()/unmerge(). Unmerge only when merged.

---
 PMSTestSuite/pm/__init__.py  |    8 ++++----
 PMSTestSuite/pm/portagepm.py |   13 ++++++++-----
 PMSTestSuite/testrunner.py   |   12 ++++++++----
 3 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/PMSTestSuite/pm/__init__.py b/PMSTestSuite/pm/__init__.py
index 9838822..cc6d3d5 100644
--- a/PMSTestSuite/pm/__init__.py
+++ b/PMSTestSuite/pm/__init__.py
@@ -51,9 +51,9 @@ class PackageManager(object):
 		"""
 		self.repo_paths.append(repo.path)
 
-	def merge(self, atoms):
+	def merge(self, cpvs):
 		"""
-		Run PM to merge <atoms>.
+		Run PM to merge <cpvs>.
 
 		Returns True if PM run successfully, False otherwise. Please note that
 		this return code may not have anything to do with ebuilds actually
@@ -61,9 +61,9 @@ class PackageManager(object):
 		"""
 		raise NotImplementedError('Please override the merge() method.')
 
-	def unmerge(self, atoms):
+	def unmerge(self, cpvs):
 		"""
-		Run PM to unmerge <atoms>.
+		Run PM to unmerge <cpvs>.
 
 		Returns True if PM run successfully, False otherwise. Please note that
 		this return code may not have anything to do with ebuilds actually

diff --git a/PMSTestSuite/pm/portagepm.py b/PMSTestSuite/pm/portagepm.py
index 9d5fa0b..d73406b 100644
--- a/PMSTestSuite/pm/portagepm.py
+++ b/PMSTestSuite/pm/portagepm.py
@@ -35,14 +35,17 @@ class PortagePM(PackageManager):
 			subprocess.check_call([self.repoman_path, 'manifest'])
 		os.chdir(startdir)
 
-	def merge(self, atoms):
-		ret = subprocess.call([self.emerge_path] + self.pm_options + atoms,
+	def call_emerge(self, cpvs, opts = []):
+		return subprocess.call([self.emerge_path] + opts + self.pm_options
+				+ ['=%s' % cpv for cpv in cpvs],
 				env = {'PORTDIR_OVERLAY': ' '.join(self.repo_paths)})
+
+	def merge(self, cpvs):
+		ret = self.call_emerge(cpvs)
 		return ret == 0
 
-	def unmerge(self, atoms):
-		ret = subprocess.call([self.emerge_path, '--unmerge'] + self.pm_options + atoms,
-				env = {'PORTDIR_OVERLAY': ' '.join(self.repo_paths)})
+	def unmerge(self, cpvs):
+		ret = self.call_emerge(cpvs, ['--unmerge'])
 		return ret == 0
 
 	_vardb = None

diff --git a/PMSTestSuite/testrunner.py b/PMSTestSuite/testrunner.py
index 76f7071..703ae31 100644
--- a/PMSTestSuite/testrunner.py
+++ b/PMSTestSuite/testrunner.py
@@ -8,10 +8,14 @@ class TestRunnerCLI(EbuildGenCLI):
 			return ret
 
 		self.pm.append_repository(self.repository)
-		atoms = ['=%s' % t.p for t in self.test_library]
-		print('-> Unmerging already-merged test ebuilds...')
-		self.pm.unmerge(atoms)
+		cpvs = [t.p for t in self.test_library]
+
+		installedcpvs = self.pm.lookup_vardb(cpvs)
+		if installedcpvs:
+			print('-> Unmerging already-merged test ebuilds...')
+			self.pm.unmerge(installedcpvs)
+
 		print('-> Running PM...')
-		self.pm.merge(atoms)
+		self.pm.merge(cpvs)
 
 		return 0