Breezy

Merge lp:~jelmer/brz/python3-chk-map-more into lp:brz

  1. python3-chk-map-more
  2. Merge into trunk
Proposed by Jelmer Vernooij
Status: Merged
Approved by: Jelmer Vernooij
Approved revision: no longer in the source branch.
Merge reported by: The Breezy Bot
Merged at revision: not available
Proposed branch: lp:~jelmer/brz/python3-chk-map-more
Merge into: lp:brz
Diff against target: 117 lines (+21/-12)
3 files modified
breezy/bzr/chk_map.py (+1/-2)
breezy/tests/test_chk_map.py (+8/-6)
python3.passing (+12/-4)
To merge this branch: bzr merge lp:~jelmer/brz/python3-chk-map-more
Reviewer Review Type Date Requested Status
Martin Packman Approve
Review via email: mp+353374@code.launchpad.net

Commit message

Fix remaining chk_map tests on Python 3.

Description of the change

Fix remaining chk_map tests on Python 3.

This assumes that it's fine that Node._iter_nodes() shouldn't actually sort its output. The other option would be to get it to do sorting rather than the tests.

To post a comment you must log in.
Revision history for this message
Martin Packman (gz) wrote :

Hm, not assuming sorting in tests seems correct.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'breezy/bzr/chk_map.py'
2--- breezy/bzr/chk_map.py 2018-07-11 21:08:11 +0000
3+++ breezy/bzr/chk_map.py 2018-08-19 13:48:21 +0000
4@@ -1223,8 +1223,7 @@
5 new_parent.add_node(self._search_prefix[:len(new_prefix)+1],
6 self)
7 return new_parent.map(store, key, value)
8- children = [node for node, _
9- in self._iter_nodes(store, key_filter=[key])]
10+ children = [node for node, _ in self._iter_nodes(store, key_filter=[key])]
11 if children:
12 child = children[0]
13 else:
14
15=== modified file 'breezy/tests/test_chk_map.py'
16--- breezy/tests/test_chk_map.py 2018-08-06 01:42:32 +0000
17+++ breezy/tests/test_chk_map.py 2018-08-19 13:48:21 +0000
18@@ -372,10 +372,12 @@
19 # Internal nodes must have identical references
20 self.assertEqual(sorted(node_one._items.keys()),
21 sorted(node_two._items.keys()))
22- node_one_stack.extend([n for n, _ in
23- node_one._iter_nodes(map_one._store)])
24- node_two_stack.extend([n for n, _ in
25- node_two._iter_nodes(map_two._store)])
26+ node_one_stack.extend(sorted(
27+ [n for n, _ in node_one._iter_nodes(map_one._store)],
28+ key=lambda a: a._search_prefix))
29+ node_two_stack.extend(sorted(
30+ [n for n, _ in node_two._iter_nodes(map_two._store)],
31+ key=lambda a: a._search_prefix))
32 else:
33 # Leaf nodes must have identical contents
34 self.assertEqual(node_one._items, node_two._items)
35@@ -1440,7 +1442,7 @@
36 " ('3',) 'baz'\n"
37 " '\\x83' LeafNode\n"
38 " ('1',) 'foo'\n"
39- , chkmap._dump_tree())
40+ , chkmap._dump_tree(encoding='latin1'))
41 root_key = chkmap._save()
42 chkmap = chk_map.CHKMap(chk_bytes, root_key,
43 search_key_func=chk_map._search_key_255)
44@@ -1454,7 +1456,7 @@
45 " ('3',) 'baz'\n"
46 " '\\x83' LeafNode\n"
47 " ('1',) 'foo'\n"
48- , chkmap._dump_tree())
49+ , chkmap._dump_tree(encoding='latin1'))
50
51 def test_search_key_collisions(self):
52 chkmap = chk_map.CHKMap(self.get_chk_bytes(), None,
53
54=== modified file 'python3.passing'
55--- python3.passing 2018-08-08 02:10:06 +0000
56+++ python3.passing 2018-08-19 13:48:21 +0000
57@@ -9130,16 +9130,16 @@
58 breezy.tests.per_repository_reference.test_get_record_stream.TestGetRecordStream.test_ordered_no_closure(RemoteRepositoryFormat-v2)
59 breezy.tests.per_repository_reference.test_get_record_stream.TestGetRecordStream.test_ordered_no_closure(RepositoryFormat2a)
60 breezy.tests.per_repository_reference.test_get_record_stream.TestGetRecordStream.test_ordered_no_closure(RepositoryFormat2aSubtree)
61-breezy.tests.per_repository_reference.test_get_record_stream.TestGetRecordStream.test_unordered_fetch_complex_split(RemoteRepositoryFormat-default)
62-breezy.tests.per_repository_reference.test_get_record_stream.TestGetRecordStream.test_unordered_fetch_complex_split(RemoteRepositoryFormat-v2)
63-breezy.tests.per_repository_reference.test_get_record_stream.TestGetRecordStream.test_unordered_fetch_complex_split(RepositoryFormat2a)
64-breezy.tests.per_repository_reference.test_get_record_stream.TestGetRecordStream.test_unordered_fetch_complex_split(RepositoryFormat2aSubtree)
65 breezy.tests.per_repository_reference.test_get_record_stream.TestGetRecordStream.test_ordered_no_closure(RepositoryFormatKnitPack5)
66 breezy.tests.per_repository_reference.test_get_record_stream.TestGetRecordStream.test_ordered_no_closure(RepositoryFormatKnitPack5RichRoot)
67 breezy.tests.per_repository_reference.test_get_record_stream.TestGetRecordStream.test_ordered_no_closure(RepositoryFormatKnitPack5RichRootBroken)
68 breezy.tests.per_repository_reference.test_get_record_stream.TestGetRecordStream.test_ordered_no_closure(RepositoryFormatKnitPack6)
69 breezy.tests.per_repository_reference.test_get_record_stream.TestGetRecordStream.test_ordered_no_closure(RepositoryFormatKnitPack6RichRoot)
70 breezy.tests.per_repository_reference.test_get_record_stream.TestGetRecordStream.test_ordered_no_closure(RepositoryFormatPackDevelopment2Subtree)
71+breezy.tests.per_repository_reference.test_get_record_stream.TestGetRecordStream.test_unordered_fetch_complex_split(RemoteRepositoryFormat-default)
72+breezy.tests.per_repository_reference.test_get_record_stream.TestGetRecordStream.test_unordered_fetch_complex_split(RemoteRepositoryFormat-v2)
73+breezy.tests.per_repository_reference.test_get_record_stream.TestGetRecordStream.test_unordered_fetch_complex_split(RepositoryFormat2a)
74+breezy.tests.per_repository_reference.test_get_record_stream.TestGetRecordStream.test_unordered_fetch_complex_split(RepositoryFormat2aSubtree)
75 breezy.tests.per_repository_reference.test_get_record_stream.TestGetRecordStream.test_unordered_fetch_complex_split(RepositoryFormatKnitPack5)
76 breezy.tests.per_repository_reference.test_get_record_stream.TestGetRecordStream.test_unordered_fetch_complex_split(RepositoryFormatKnitPack5RichRoot)
77 breezy.tests.per_repository_reference.test_get_record_stream.TestGetRecordStream.test_unordered_fetch_complex_split(RepositoryFormatKnitPack5RichRootBroken)
78@@ -22735,14 +22735,17 @@
79 breezy.tests.test_chk_map.TestLeafNode.test_unmap_present
80 breezy.tests.test_chk_map.TestMapSearchKeys.test_default_chk_map_uses_flat_search_key
81 breezy.tests.test_chk_map.TestMapSearchKeys.test_search_key_16
82+breezy.tests.test_chk_map.TestMapSearchKeys.test_search_key_255
83 breezy.tests.test_chk_map.TestMapSearchKeys.test_search_key_collisions
84 breezy.tests.test_chk_map.TestMapSearchKeys.test_search_key_is_passed_to_root_node
85 breezy.tests.test_chk_map.TestMapSearchKeys.test_search_key_passed_via__ensure_root
86 breezy.tests.test_chk_map.TestMapSearchKeys.test_search_key_with_internal_node
87 breezy.tests.test_chk_map.TestMap.test_apply_ab_empty
88 breezy.tests.test_chk_map.TestMap.test_apply_delete_to_internal_node
89+breezy.tests.test_chk_map.TestMap.test_apply_delta_is_deterministic
90 breezy.tests.test_chk_map.TestMap.test_apply_empty_ab
91 breezy.tests.test_chk_map.TestMap.test_apply_new_keys_must_be_new
92+breezy.tests.test_chk_map.TestMap.test_assert_map_layout_equal
93 breezy.tests.test_chk_map.TestMap.test_deep_splitting
94 breezy.tests.test_chk_map.TestMap.test__dump_tree
95 breezy.tests.test_chk_map.TestMap.test__dump_tree_in_progress
96@@ -22767,9 +22770,13 @@
97 breezy.tests.test_chk_map.TestMap.test_iteritems_two_items
98 breezy.tests.test_chk_map.TestMap.test___len__2
99 breezy.tests.test_chk_map.TestMap.test___len__empty
100+breezy.tests.test_chk_map.TestMap.test_map_collapses_if_size_changes
101 breezy.tests.test_chk_map.TestMap.test_map_double_deep_collapses
102 breezy.tests.test_chk_map.TestMap.test_map_first_item_new
103+breezy.tests.test_chk_map.TestMap.test_map_splits_with_longer_key
104 breezy.tests.test_chk_map.TestMap.test_max_size_100_bytes_new
105+breezy.tests.test_chk_map.TestMap.test_stable_splitting
106+breezy.tests.test_chk_map.TestMap.test_stable_unmap
107 breezy.tests.test_chk_map.TestMap.test_unmap_double_deep
108 breezy.tests.test_chk_map.TestMap.test_unmap_double_deep_non_empty_leaf
109 breezy.tests.test_chk_map.TestMap.test_unmap_last_item_root_is_leaf_new
110@@ -22778,6 +22785,7 @@
111 breezy.tests.test_chk_map.TestMap.test_unmap_uses_existing_items
112 breezy.tests.test_chk_map.TestMap.test_unmap_with_known_internal_node_doesnt_page
113 breezy.tests.test_chk_map.TestMap.test_unmap_without_fitting_doesnt_page_in
114+breezy.tests.test_chk_map.TestMap.test_with_linefeed_in_key
115 breezy.tests.test_chk_map.TestNode.test_common_prefix
116 breezy.tests.test_chk_map.TestNode.test_empty
117 breezy.tests.test_chk_map.TestNode.test_equal

Subscribers

People subscribed via source and target branches