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

[Michał Górny]

commit:     29fa19fb5db1c860bc7c54df6426aea5aaac063d
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Jun  1 11:23:32 2011 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Jun  1 11:23:32 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/pms-test-suite.git;a=commit;h=29fa19fb

Commonize the CLI code for single executable.

---
 PMSTestSuite/cli.py        |   55 ++++++++++++++++++++++++++++++++++++++++++-
 PMSTestSuite/testrunner.py |   55 --------------------------------------------
 pms-tester                 |    4 +-
 3 files changed, 55 insertions(+), 59 deletions(-)

diff --git a/PMSTestSuite/cli.py b/PMSTestSuite/cli.py
index 7db4713..f7eb7ae 100644
--- a/PMSTestSuite/cli.py
+++ b/PMSTestSuite/cli.py
@@ -3,6 +3,7 @@
 # Released under the terms of the 2-clause BSD license.
 
 import os.path, shlex
+import gobject
 
 from optparse import OptionParser
 
@@ -13,8 +14,7 @@ from PMSTestSuite.pm import get_package_managers
 
 class PMSTestSuiteCLI(object):
 	"""
-	A class encapsulating common CLI routines used by PMS Test Suite
-	scripts.
+	A class encapsulating CLI routines used by the PMS Test Suite.
 
 	Properties:
 	1) set during __init__():
@@ -84,3 +84,54 @@ class PMSTestSuiteCLI(object):
 			self.test_library = load_library(opts.library_name)
 		except (ImportError, TypeError) as e:
 			opt.error('Test library load failed: %s' % e)
+
+	def merge_done(self, pid, ret):
+		failed = []
+
+		cpvs = frozenset(self.pm.lookup_vardb(self.cpvs))
+		for t in self.test_library:
+			res = t.check_result(t.cpv in cpvs)
+			if not res:
+				failed.append(t)
+
+		if len(failed) != len(self.cpvs):
+			print('-> Unmerging test ebuilds...')
+			self.pm.unmerge(cpvs)
+
+		if not failed:
+			print('%d tests completed successfully.' % len(self.cpvs))
+		else:
+			print('%d of %d tests completed successfully, %d failed:'
+					% (len(self.cpvs) - len(failed), len(self.cpvs), len(failed)))
+			for t in failed:
+				print('- %s' % t.p)
+
+		self.ret = 0 if not failed else 1
+		self.loop.quit()
+
+	def main(self, argv):
+		self._start(*argv)
+
+		print('-> Generating ebuilds...')
+		files = {}
+		for t in self.test_library:
+			files.update(t.get_output_files())
+
+		self.repository.write_files(files)
+		self.repository.remanifest(files, self.pm)
+
+		self.pm.append_repository(self.repository)
+		self.cpvs = [t.cpv for t in self.test_library]
+
+		installedcpvs = self.pm.lookup_vardb(self.cpvs)
+		if installedcpvs:
+			print('-> Unmerging already-merged test ebuilds...')
+			self.pm.unmerge(installedcpvs)
+
+		print('-> Running PM...')
+		self.loop = gobject.MainLoop()
+		gobject.child_watch_add(self.pm.merge_async(self.cpvs),
+				self.merge_done)
+		self.loop.run()
+
+		return self.ret

diff --git a/PMSTestSuite/testrunner.py b/PMSTestSuite/testrunner.py
deleted file mode 100644
index 19c3749..0000000
--- a/PMSTestSuite/testrunner.py
+++ /dev/null
@@ -1,55 +0,0 @@
-from PMSTestSuite.ebuildgen import EbuildGenCLI
-
-import gobject
-
-class TestRunnerCLI(EbuildGenCLI):
-	def merge_done(self, pid, ret):
-		failed = []
-
-		cpvs = frozenset(self.pm.lookup_vardb(self.cpvs))
-		for t in self.test_library:
-			res = t.check_result(t.cpv in cpvs)
-			if not res:
-				failed.append(t)
-
-		if len(failed) != len(self.cpvs):
-			print('-> Unmerging test ebuilds...')
-			self.pm.unmerge(cpvs)
-
-		if not failed:
-			print('%d tests completed successfully.' % len(self.cpvs))
-		else:
-			print('%d of %d tests completed successfully, %d failed:'
-					% (len(self.cpvs) - len(failed), len(self.cpvs), len(failed)))
-			for t in failed:
-				print('- %s' % t.p)
-
-		self.ret = 0 if not failed else 1
-		self.loop.quit()
-
-	def main(self, argv):
-		self._start(*argv)
-
-		print('-> Generating ebuilds...')
-		files = {}
-		for t in self.test_library:
-			files.update(t.get_output_files())
-
-		self.repository.write_files(files)
-		self.repository.remanifest(files, self.pm)
-
-		self.pm.append_repository(self.repository)
-		self.cpvs = [t.cpv for t in self.test_library]
-
-		installedcpvs = self.pm.lookup_vardb(self.cpvs)
-		if installedcpvs:
-			print('-> Unmerging already-merged test ebuilds...')
-			self.pm.unmerge(installedcpvs)
-
-		print('-> Running PM...')
-		self.loop = gobject.MainLoop()
-		gobject.child_watch_add(self.pm.merge_async(self.cpvs),
-				self.merge_done)
-		self.loop.run()
-
-		return self.ret

diff --git a/pms-tester b/pms-tester
index ededbef..317b587 100755
--- a/pms-tester
+++ b/pms-tester
@@ -5,8 +5,8 @@
 
 import sys
 
-from PMSTestSuite.testrunner import TestRunnerCLI
+from PMSTestSuite.cli import PMSTestSuiteCLI
 
 if __name__ == '__main__':
-	cli = TestRunnerCLI()
+	cli = PMSTestSuiteCLI()
 	sys.exit(cli.main(sys.argv))