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

[Michał Górny]

commit:     6f30312d03eed2ac0317bbf0afab11b9f6d9313d
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 29 12:25:54 2011 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Jun 29 12:25:54 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/pms-test-suite.git;a=commit;h=6f30312d

Add a common DBusFetchingEbuildTestCase.

---
 pmstestsuite/library/standard/deprecated_vars.py  |   12 ++++++++----
 pmstestsuite/library/standard/ext_cases.py        |   19 +++++++++++++++++++
 pmstestsuite/library/standard/workdir_fallback.py |    7 +++----
 3 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/pmstestsuite/library/standard/deprecated_vars.py b/pmstestsuite/library/standard/deprecated_vars.py
index c4c72a3..fce66f9 100644
--- a/pmstestsuite/library/standard/deprecated_vars.py
+++ b/pmstestsuite/library/standard/deprecated_vars.py
@@ -3,15 +3,14 @@
 # Released under the terms of the 2-clause BSD license.
 
 from pmstestsuite.library.standard.dbus_case import DBusEbuildTestCase
+from pmstestsuite.library.standard.ext_cases import DBusFetchingEbuildTestCase
 
-class AATest(DBusEbuildTestCase):
+class AATest(DBusFetchingEbuildTestCase):
 	""" Test whether AA is declared. """
 
 	relevant_eapis = (3, 4)
 	ebuild_vars = {
-		'IUSE': 'pms_tests_magical_hidden_use', # XXX?
-		'SRC_URI': '''pms_tests_magical_hidden_use? (
-		http://www.gentoo.org/ -> pms-test-suite-dummy.html )'''
+		'IUSE': 'pms_tests_magical_hidden_use' # XXX?
 	}
 	phase_funcs = {
 		'src_unpack': [
@@ -19,6 +18,11 @@ class AATest(DBusEbuildTestCase):
 		]
 	}
 
+	def __init__(self, *args, **kwargs):
+		DBusFetchingEbuildTestCase.__init__(self, *args, **kwargs)
+		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'

diff --git a/pmstestsuite/library/standard/ext_cases.py b/pmstestsuite/library/standard/ext_cases.py
new file mode 100644
index 0000000..d1d5eb6
--- /dev/null
+++ b/pmstestsuite/library/standard/ext_cases.py
@@ -0,0 +1,19 @@
+#	vim:fileencoding=utf-8
+# (c) 2011 Michał Górny <mgorny@g.o>
+# Released under the terms of the 2-clause BSD license.
+
+from pmstestsuite.library.standard.dbus_case import DBusEbuildTestCase
+
+class DBusFetchingEbuildTestCase(DBusEbuildTestCase):
+	"""
+	A DBusEbuildTestCase variant with a standarized way of fetching
+	sources -- to decrease ${DISTDIR} pollution.
+	"""
+
+	def __init__(self, *args, **kwargs):
+		DBusEbuildTestCase.__init__(self, *args, **kwargs)
+		# XXX: switch to a dedicated file without the arrow
+		val = 'http://www.gentoo.org/ -> pms-test-suite-dummy.html'
+		if 'SRC_URI' in self.ebuild_vars:
+			val = '%s %s' % (self.ebuild_vars['SRC_URI'], val)
+		self.ebuild_vars['SRC_URI'] = val

diff --git a/pmstestsuite/library/standard/workdir_fallback.py b/pmstestsuite/library/standard/workdir_fallback.py
index 142c33c..96cd2e8 100644
--- a/pmstestsuite/library/standard/workdir_fallback.py
+++ b/pmstestsuite/library/standard/workdir_fallback.py
@@ -2,9 +2,9 @@
 # (c) 2011 Michał Górny <mgorny@g.o>
 # Released under the terms of the 2-clause BSD license.
 
-from pmstestsuite.library.standard.dbus_case import DBusEbuildTestCase
+from pmstestsuite.library.standard.ext_cases import DBusFetchingEbuildTestCase
 
-class WorkdirFallbackTest(DBusEbuildTestCase):
+class WorkdirFallbackTest(DBusFetchingEbuildTestCase):
 	""" S=${WORKDIR} fallback test. """
 
 	relevant_eapis = (2, 4)
@@ -15,7 +15,6 @@ class WorkdirFallbackTest(DBusEbuildTestCase):
 	# 3) have one of the further phase funcs.
 
 	ebuild_vars = {
-		'SRC_URI': 'http://www.gentoo.org/ -> pms-test-suite-dummy.html',
 		'S': '${WORKDIR}/nonexistent'
 	}
 	phase_funcs = {
@@ -28,5 +27,5 @@ class WorkdirFallbackTest(DBusEbuildTestCase):
 	}
 
 	def __init__(self, *args, **kwargs):
-		DBusEbuildTestCase.__init__(self, *args, **kwargs)
+		DBusFetchingEbuildTestCase.__init__(self, *args, **kwargs)
 		self.expect_failure = (self.eapi == 4)