1
Author: Jelmer Vernooij <jelmer@debian.org>
2
Description: Cope with slightly more efficient newer versions of zlib (>= 1.2.6)
3
Status: Not yet upstream; not fit for upstreaming as-is because it breaks support for older versions of zlib
4
Bug: http://pad.lv/940453
6
=== modified file 'bzrlib/tests/test_btree_index.py'
7
--- old/bzrlib/tests/test_btree_index.py 2011-12-08 11:27:06 +0000
8
+++ new/bzrlib/tests/test_btree_index.py 2012-02-25 14:01:11 +0000
10
temp_file = builder.finish()
11
content = temp_file.read()
13
- self.assertEqual(9283, len(content))
14
+ self.assertEqual(9281, len(content))
16
"B+Tree Graph Index 2\nnode_ref_lists=0\nkey_elements=1\nlen=400\n"
19
temp_file = builder.finish()
20
content = temp_file.read()
22
- self.assertEqual(9283, len(content))
23
+ self.assertEqual(9281, len(content))
25
"B+Tree Graph Index 2\nnode_ref_lists=0\nkey_elements=1\nlen=400\n"
28
# The entire index should have been read, as it is one page long.
29
self.assertEqual([('readv', 'index', [(0, size)], False, None)],
31
- self.assertEqual(1173, size)
32
+ self.assertEqual(1169, size)
34
def test_with_offset_no_size(self):
35
index = self.make_index_with_offset(key_elements=1, ref_lists=1,
37
builder.add_node(*node)
38
t = transport.get_transport_from_url('trace+' + self.get_url(''))
39
size = t.put_file('index', builder.finish())
40
- self.assertEqual(17692, size)
41
+ self.assertEqual(17687, size)
42
index = btree_index.BTreeGraphIndex(t, 'index', size)
44
self.assertEqual([], t._activity)
46
# The entire index should have been read linearly.
47
self.assertEqual([('readv', 'index', [(0, size)], False, None)],
49
- self.assertEqual(1488, size)
50
+ self.assertEqual(1487, size)
52
def test_validate_two_pages(self):
53
builder = btree_index.BTreeBuilder(key_elements=2, reference_lists=2)
55
t = transport.get_transport_from_url('trace+' + self.get_url(''))
56
size = t.put_file('index', builder.finish())
57
# Root page, 2 leaf pages
58
- self.assertEqual(9339, size)
59
+ self.assertEqual(9336, size)
60
index = btree_index.BTreeGraphIndex(t, 'index', size)
62
self.assertEqual([], t._activity)
64
# The entire index should have been read linearly.
66
[('readv', 'index', [(0, 4096)], False, None),
67
- ('readv', 'index', [(4096, 4096), (8192, 1147)], False, None)],
68
+ ('readv', 'index', [(4096, 4096), (8192, 1144)], False, None)],
70
# XXX: TODO: write some badly-ordered nodes, and some pointers-to-wrong
71
# node and make validate find them.
73
builder.add_node(*node)
74
t = transport.get_transport_from_url('trace+' + self.get_url(''))
75
size = t.put_file('index', builder.finish())
76
- self.assertEqual(1303220, size, 'number of expected bytes in the'
77
+ self.assertEqual(1303219, size, 'number of expected bytes in the'
79
page_size = btree_index._PAGE_SIZE
82
# The entire index should have been read
83
total_pages = sum(index._row_lengths)
84
self.assertEqual(total_pages, index._row_offsets[-1])
85
- self.assertEqual(1303220, size)
86
+ self.assertEqual(1303219, size)
87
# The start of the leaves
88
first_byte = index._row_offsets[-2] * page_size
90
for offset in range(first_byte, size, page_size):
91
readv_request.append((offset, page_size))
92
# The last page is truncated
93
- readv_request[-1] = (readv_request[-1][0], 1303220 % page_size)
94
+ readv_request[-1] = (readv_request[-1][0], 1303219 % page_size)
95
expected = [('readv', 'index', [(0, page_size)], False, None),
96
('readv', 'index', readv_request, False, None)]
97
if expected != t._activity:
added
removed
debian/patches/04_new_zlib
