diff options
| author | Patrick Ohly <patrick.ohly@intel.com> | 2013-02-21 23:51:48 -0800 |
|---|---|---|
| committer | Patrick Ohly <patrick.ohly@intel.com> | 2013-02-26 12:03:46 +0100 |
| commit | 58500350d57a1b5ec2f21dd2af7c2870fd1739a8 (patch) | |
| tree | 9a82688019b34c97648f67c0a4077c0756a9b875 /test | |
| parent | 9e197a48f3d3b7a759d4cbea8b71c9d1b91aaa24 (diff) | |
D-Bus testing: merge with truncated D-Bus log
Diffstat (limited to 'test')
| -rwxr-xr-x | test/test-dbus.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/test/test-dbus.py b/test/test-dbus.py index 15ffb23f..4d8278c0 100755 --- a/test/test-dbus.py +++ b/test/test-dbus.py @@ -633,13 +633,15 @@ class DBusUtil(Timeout): result.errors.append((self, "dbus-monitor had to be killed with SIGKILL")) - dbusLogLimit = 1000 * 80 # roughly 1000 lines as limit + # If reading the dbus-monitor output, then read it completely. + # The runTestDBusCheck callbacks expect that and it is confusing + # when the report printed as part of a test failure is incomplete. if debugger: monitorout = '<see %s>' % dbuslog elif useGZip: - monitorout = dbuslog + ':\n' + gzip.GzipFile(dbuslog).read(dbusLogLimit) + monitorout = dbuslog + ':\n' + gzip.GzipFile(dbuslog).read() else: - monitorout = dbuslog + ':\n' + open(dbuslog).read(dbusLogLimit) + monitorout = dbuslog + ':\n' + open(dbuslog).read() report = "\n\nD-Bus traffic:\n%s\n\nserver output:\n%s\n" % \ (monitorout, serverout) runTestDBusCheck = getattr(self, 'runTestDBusCheck', None) |