Rev 6478: (gz) Merge 2.5 for one more test fix with newer zlib (Martin Packman) in file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/

[Patch Queue Manager]

At file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 6478 [merge]
revision-id: pqm at pqm.ubuntu.com-20120227170005-y7bp8qlwln5gsl38
parent: pqm at pqm.ubuntu.com-20120227152055-sw2fya70kpfk3h4y
parent: martin.packman at canonical.com-20120227163211-2ktv1vb2kqdjqt43
committer: Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2012-02-27 17:00:05 +0000
message:
  (gz) Merge 2.5 for one more test fix with newer zlib (Martin Packman)
modified:
  bzrlib/tests/test_btree_index.py test_index.py-20080624222253-p0x5f92uyh5hw734-13
=== modified file 'bzrlib/tests/test_btree_index.py'
--- a/bzrlib/tests/test_btree_index.py	2012-02-27 13:07:18 +0000
+++ b/bzrlib/tests/test_btree_index.py	2012-02-27 15:49:07 +0000
@@ -899,12 +899,12 @@
         for offset in range(first_byte, size, page_size):
             readv_request.append((offset, page_size))
         # The last page is truncated
-        readv_request[-1] = (readv_request[-1][0], 1303220 % page_size)
+        readv_request[-1] = (readv_request[-1][0], size % page_size)
         expected = [('readv', 'index', [(0, page_size)], False, None),
              ('readv',  'index', readv_request, False, None)]
         if expected != t._activity:
             self.assertEqualDiff(pprint.pformat(expected),
-                                 pprint.pformat(transport._activity))
+                                 pprint.pformat(t._activity))
 
     def _test_iter_entries_references_resolved(self):
         index = self.make_index(1, nodes=[