diff options
Diffstat (limited to 'pmstestsuite/library/standard/special_vars.py')
| -rw-r--r-- | pmstestsuite/library/standard/special_vars.py | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/pmstestsuite/library/standard/special_vars.py b/pmstestsuite/library/standard/special_vars.py index 8283a60..acbfd32 100644 --- a/pmstestsuite/library/standard/special_vars.py +++ b/pmstestsuite/library/standard/special_vars.py @@ -2,9 +2,9 @@ # (c) 2011-2012 Michał Górny <mgorny@gentoo.org> # Released under the terms of the 2-clause BSD license. -from .dbus_case import DBusEbuildTestCase +from pmstestsuite.library.case import EbuildTestCase -class InheritedVariableTest(DBusEbuildTestCase): +class InheritedVariableTest(EbuildTestCase): """ INHERITED variable definition test. """ phase_funcs = { @@ -14,11 +14,10 @@ class InheritedVariableTest(DBusEbuildTestCase): } def check_dbus_result(self, output, pm): - DBusEbuildTestCase.check_dbus_result(self, output, pm) inherits = output[0].split() self.assertContains('pms-test', inherits, 'INHERITED') -class RDependFallbackTest(DBusEbuildTestCase): +class RDependFallbackTest(EbuildTestCase): """ Test whether RDEPEND=${DEPEND} fallback works as expected. """ supported_eapis = (range(0, 4), (4,)) @@ -28,8 +27,6 @@ class RDependFallbackTest(DBusEbuildTestCase): } def check_dbus_result(self, output, pm): - DBusEbuildTestCase.check_dbus_result(self, output, pm) - class DepMatcher(object): def __eq__(self, other): return other.key == str(self) @@ -50,7 +47,7 @@ class RDependFallbackTest(DBusEbuildTestCase): else: self.assertContains(mydep, rdep, 'RDEPEND') -class DefinedPhasesTest(DBusEbuildTestCase): +class DefinedPhasesTest(EbuildTestCase): """ Test whether DEFINED_PHASES are declared in EAPI 4. """ supported_eapis = ((4,),) @@ -61,7 +58,5 @@ class DefinedPhasesTest(DBusEbuildTestCase): } def check_dbus_result(self, output, pm): - DBusEbuildTestCase.check_dbus_result(self, output, pm) - phases = pm.installed[self.atom(pm)].defined_phases self.assertEqual(tuple(phases), ('setup',), 'DEFINED_PHASES') |