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

[Michał Górny]

commit:     3d662ee7757f26772bf0a343e56a77398893da06
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  2 18:13:00 2011 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Aug  2 18:13:00 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/pms-test-suite.git;a=commit;h=3d662ee7

Fix AA test, use .assert*Equal() in KV/AA tests.

---
 pmstestsuite/library/standard/deprecated_vars.py |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/pmstestsuite/library/standard/deprecated_vars.py b/pmstestsuite/library/standard/deprecated_vars.py
index fce66f9..4b8b672 100644
--- a/pmstestsuite/library/standard/deprecated_vars.py
+++ b/pmstestsuite/library/standard/deprecated_vars.py
@@ -2,6 +2,8 @@
 # (c) 2011 Michał Górny <mgorny@g.o>
 # Released under the terms of the 2-clause BSD license.
 
+import os.path
+
 from pmstestsuite.library.standard.dbus_case import DBusEbuildTestCase
 from pmstestsuite.library.standard.ext_cases import DBusFetchingEbuildTestCase
 
@@ -20,18 +22,19 @@ class AATest(DBusFetchingEbuildTestCase):
 
 	def __init__(self, *args, **kwargs):
 		DBusFetchingEbuildTestCase.__init__(self, *args, **kwargs)
+		self._expect_fn = os.path.split(self.ebuild_vars['SRC_URI'])[1]
 		self.ebuild_vars['SRC_URI'] = 'pms_tests_magical_hidden_use? ( %s )' \
 				% self.ebuild_vars['SRC_URI']
 
 	def check_dbus_result(self, output, pm):
 		if self.eapi < 4:
-			expect = 'pms-test-suite-dummy.html'
+			expect = self._expect_fn
 		else:
 			expect = ''
 
-		return output == expect \
-			and DBusEbuildTestCase.check_dbus_result(self, output, pm)
-			
+		DBusEbuildTestCase.check_dbus_result(self, output, pm)
+		self.assertEqual(output, expect, '${AA}')
+
 class KVTest(DBusEbuildTestCase):
 	""" Test whether KV is declared. """
 
@@ -43,5 +46,7 @@ class KVTest(DBusEbuildTestCase):
 	}
 
 	def check_dbus_result(self, output, pm):
-		return bool(output) ^ (self.eapi == 4) \
-			and DBusEbuildTestCase.check_dbus_result(self, output, pm)
+		DBusEbuildTestCase.check_dbus_result(self, output, pm)
+		func = self.assertEqual if self.eapi == 4 \
+				else self.assertNotEqual
+		func(output, '', '${KV}')