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

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

commit:     ddaeea47f4a7f3b034ac2db998aedb0cfc3e82cf
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Aug  6 08:02:03 2011 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Aug  6 08:03:31 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/pms-test-suite.git;a=commit;h=ddaeea47

Add additional checks for dohard & dosed.

---
 pmstestsuite/library/standard/banned_commands.py |   27 +++++++++++++++++----
 1 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/pmstestsuite/library/standard/banned_commands.py b/pmstestsuite/library/standard/banned_commands.py
index 114089b..456b055 100644
--- a/pmstestsuite/library/standard/banned_commands.py
+++ b/pmstestsuite/library/standard/banned_commands.py
@@ -11,7 +11,7 @@ class BannedCommandTest(DBusEbuildTestCase):
 		DBusEbuildTestCase.__init__(self, *args, **kwargs)
 		self._path = '/tmp/pms-test-suite-%d' % id(self)
 		self.phase_funcs['src_install'].extend([
-			'touch foo || die',
+			'{ echo > foo; } || die',
 			'insinto %s' % self._path,
 			'doins foo || die'
 		])
@@ -22,13 +22,30 @@ class DoHardCommandTest(BannedCommandTest):
 
 	def __init__(self, *args, **kwargs):
 		BannedCommandTest.__init__(self, *args, **kwargs)
-		self.phase_funcs['src_install'].append(
-				'dohard %s/foo %s/bar || die' % (self._path, self._path))
+		self.phase_funcs['src_install'].extend([
+				'dohard %s/foo %s/bar || die' % (self._path, self._path),
+				'[[ "${D}"%s/foo -ef "${D}"%s/bar ]]' % (self._path, self._path),
+				'pms-test-dbus_append_result ${?}'])
+
+	def check_dbus_result(self, output, pm):
+		try:
+			BannedCommandTest.check_dbus_result(self, output, pm)
+		finally:
+			# XXX: ambiguous in EAPI 4
+			self.assertTrue(output[0] == '0', 'hardlink created')
 
 class DoSedCommandTest(BannedCommandTest):
 	""" Test whether dosed command is actually banned. """
 
 	def __init__(self, *args, **kwargs):
 		BannedCommandTest.__init__(self, *args, **kwargs)
-		self.phase_funcs['src_install'].append(
-				'dosed -e "/11/d" %s/foo || die' % self._path)
+		self.phase_funcs['src_install'].extend([
+				"dosed -e '$i SED WORKED' %s/foo || die" % self._path,
+				'pms-test-dbus_append_result "$(cat "${D}"%s/foo)"' % self._path])
+
+	def check_dbus_result(self, output, pm):
+		try:
+			BannedCommandTest.check_dbus_result(self, output, pm)
+		finally:
+			# XXX: ambiguous in EAPI 4
+			self.assertEqual(output[0].strip(), 'SED WORKED', 'dosed result')