diff options
Diffstat (limited to 'pmstestsuite/library/standard/banned_commands.py')
-rw-r--r-- | pmstestsuite/library/standard/banned_commands.py | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/pmstestsuite/library/standard/banned_commands.py b/pmstestsuite/library/standard/banned_commands.py index 216d6df..7e3de17 100644 --- a/pmstestsuite/library/standard/banned_commands.py +++ b/pmstestsuite/library/standard/banned_commands.py @@ -2,13 +2,13 @@ # (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 BannedCommandTest(DBusEbuildTestCase): +class BannedCommandTest(EbuildTestCase): supported_eapis = (range(0, 4), (4,)) def __init__(self, *args, **kwargs): - DBusEbuildTestCase.__init__(self, *args, **kwargs) + EbuildTestCase.__init__(self, *args, **kwargs) self._path = '/tmp/pms-test-suite-%d' % id(self) self.phase_funcs['src_install'].extend([ '{ echo > foo; } || die', @@ -32,13 +32,6 @@ class DoHardCommandTest(BannedCommandTest): def check_dbus_result(self, output, pm): try: - BannedCommandTest.check_dbus_result(self, output, pm) - except AssertionError as e: - exc = e - else: - exc = None - - try: res = True if output[0] == '0' else False except IndexError: res = None @@ -77,13 +70,6 @@ class DoSedCommandTest(BannedCommandTest): def check_dbus_result(self, output, pm): try: - BannedCommandTest.check_dbus_result(self, output, pm) - except AssertionError as e: - exc = e - else: - exc = None - - try: res = output[0].strip() except IndexError: res = None |