diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2011-08-05 23:35:01 +0200 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2011-08-05 23:35:01 +0200 |
| commit | a8a9475bf3e12343be0b97716f565b027928a69c (patch) | |
| tree | 229e28d74192bb185340ea2324cdcac7e4a92cf8 | |
| parent | Reset D-Bus results in all kinds of test cases. (diff) | |
| download | pms-test-suite-a8a9475bf3e12343be0b97716f565b027928a69c.tar.gz pms-test-suite-a8a9475bf3e12343be0b97716f565b027928a69c.tar.bz2 pms-test-suite-a8a9475bf3e12343be0b97716f565b027928a69c.zip | |
Fix clearing D-Bus output if exception is raised.
| -rw-r--r-- | pmstestsuite/library/standard/dbus_case.py | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/pmstestsuite/library/standard/dbus_case.py b/pmstestsuite/library/standard/dbus_case.py index 4c1ec0a..7d1b46f 100644 --- a/pmstestsuite/library/standard/dbus_case.py +++ b/pmstestsuite/library/standard/dbus_case.py @@ -108,10 +108,14 @@ class DBusBaseTestCase(object): """ pass + def _pop_dbus_output(self): + ret = self.dbus_output + self._dbusobj.reset() + return ret + def check_result(self, pm): self.assertTrue(self.dbus_started, 'build started') - self.check_dbus_result(self.dbus_output, pm) - self._dbusobj.reset() + self.check_dbus_result(self._pop_dbus_output(), pm) class DBusEbuildTestCase(DBusBaseTestCase, EbuildTestCase): """ D-Bus capable base test case. """ @@ -149,8 +153,7 @@ class DBusEbuildDependencyTestCase(DBusBaseTestCase, EbuildDependencyTestCase): def check_result(self, pm): self.assertBool(not self.expect_failure, self.dbus_started, 'build started') - self.check_dbus_result(self.dbus_output, pm) - self._dbusobj.reset() + self.check_dbus_result(self._pop_dbus_output(), pm) class DBusEclassDependencyTestCase(DBusBaseTestCase, EclassDependencyTestCase): """ D-Bus capable eclass dependency test case. """ @@ -166,5 +169,4 @@ class DBusEclassDependencyTestCase(DBusBaseTestCase, EclassDependencyTestCase): def check_result(self, pm): self.assertBool(not self.expect_failure, self.dbus_started, 'build started') - self.check_dbus_result(self.dbus_output, pm) - self._dbusobj.reset() + self.check_dbus_result(self._pop_dbus_output(), pm) |