summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Pitt <martinpitt@gnome.org>2013-01-11 14:28:17 +0100
committerMartin Pitt <martinpitt@gnome.org>2013-01-11 14:28:17 +0100
commit2f89e25c166f2fb6e1e678b9fb81e0c8088b51e8 (patch)
tree564eba58a25f579b9c53b95c617a406484d4bee6
parent335154b8a6ca13a2e791d7e1f0d9642e8c91eb20 (diff)
downloadgnome-settings-daemon-2f89e25c166f2fb6e1e678b9fb81e0c8088b51e8.tar.gz
GSDTestCase: Fix failure detection for log output
result.errors and result.failures are lists, not counts, so compare their lengths instead.
-rw-r--r--tests/gsdtestcase.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/gsdtestcase.py b/tests/gsdtestcase.py
index c2bedf8d..3d2485f6 100644
--- a/tests/gsdtestcase.py
+++ b/tests/gsdtestcase.py
@@ -93,9 +93,9 @@ class GSDTestCase(dbusmock.DBusTestCase):
shows all log files.
'''
if result:
- orig_err_fail = result.errors + result.failures
+ orig_err_fail = len(result.errors) + len(result.failures)
super(GSDTestCase, self).run(result)
- if result and result.errors + result.failures > orig_err_fail:
+ if result and len(result.errors) + len(result.failures) > orig_err_fail:
if 'SHELL_ON_FAIL' in os.environ:
subprocess.call(['bash', '-i'], cwd=self.workdir)
else: