Breezy

Merge lp:~jelmer/brz/fetch-rich-root into lp:brz

  1. fetch-rich-root
  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/fetch-rich-root
Merge into: lp:brz
Diff against target: 97 lines (+19/-11)
3 files modified
breezy/tests/per_repository/test_commit_builder.py (+13/-8)
breezy/tests/per_repository/test_fetch.py (+3/-0)
breezy/tests/per_workingtree/test_workingtree.py (+3/-3)
To merge this branch: bzr merge lp:~jelmer/brz/fetch-rich-root
Reviewer Review Type Date Requested Status
Martin Packman Approve
Review via email: mp+341186@code.launchpad.net

Commit message

Some more foreign branch test fixes.

Description of the change

Some more foreign branch test fixes:

* only run rich root file revision tests against proper versioned files repositories
* Fix some commit builder tests

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

Thanks.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'breezy/tests/per_repository/test_commit_builder.py'
2--- breezy/tests/per_repository/test_commit_builder.py 2018-02-26 13:36:15 +0000
3+++ breezy/tests/per_repository/test_commit_builder.py 2018-03-09 00:04:33 +0000
4@@ -311,6 +311,9 @@
5 def test_last_modified_revision_after_commit_dir_unchanged(self):
6 # committing without changing a dir does not change the last modified.
7 tree = self.make_branch_and_tree('.')
8+ if not tree.has_versioned_directories():
9+ raise tests.TestNotApplicable(
10+ 'Format does not support versioned directories')
11 self.build_tree(['dir/'])
12 self._add_commit_check_unchanged(tree, 'dir',
13 mini_commit=self.mini_commit_record_iter_changes)
14@@ -319,21 +322,17 @@
15 # committing without changing a dir does not change the last modified
16 # of the dir even the dirs contents are changed.
17 tree = self.make_branch_and_tree('.')
18- self.build_tree(['dir/'])
19- tree.add(['dir'])
20+ self.build_tree(['dir/', 'dir/orig'])
21+ tree.add(['dir', 'dir/orig'])
22 dir_id = tree.path2id('dir')
23 rev1 = tree.commit('')
24 self.build_tree(['dir/content'])
25 tree.add(['dir/content'])
26 rev2 = tree.commit('')
27 tree1, tree2 = self._get_revtrees(tree, [rev1, rev2])
28- if self.repository_format.supports_versioned_directories:
29- # In VCSes that don't support empty directories, 'dir' doesn't
30- # exist in rev1.
31- self.assertEqual(rev1, tree1.get_file_revision('dir'))
32+ self.assertEqual(rev1, tree1.get_file_revision('dir'))
33 self.assertEqual(rev1, tree2.get_file_revision('dir'))
34- expected_graph = {}
35- expected_graph[(dir_id, rev1)] = ()
36+ expected_graph = {(dir_id, rev1): ()}
37 self.assertFileGraph(expected_graph, tree, (dir_id, rev1))
38
39 def test_last_modified_revision_after_commit_file_unchanged(self):
40@@ -619,6 +618,9 @@
41 def test_last_modified_revision_after_merge_dir_changes(self):
42 # merge a dir changes the last modified.
43 tree1 = self.make_branch_and_tree('t1')
44+ if not tree1.has_versioned_directories():
45+ raise tests.TestNotApplicable(
46+ 'Format does not support versioned directories')
47 self.build_tree(['t1/dir/'])
48 self._commit_sprout_rename_merge(tree1, 'dir',
49 mini_commit=self.mini_commit_record_iter_changes)
50@@ -694,6 +696,9 @@
51 def test_last_modified_revision_after_converged_merge_dir_unchanged(self):
52 # merge a dir that changed preserves the last modified.
53 tree1 = self.make_branch_and_tree('t1')
54+ if not tree1.has_versioned_directories():
55+ raise tests.TestNotApplicable(
56+ 'Format does not support versioned directories')
57 self.build_tree(['t1/dir/'])
58 self._commit_sprout_rename_merge_converged(tree1, 'dir',
59 mini_commit=self.mini_commit_record_iter_changes)
60
61=== modified file 'breezy/tests/per_repository/test_fetch.py'
62--- breezy/tests/per_repository/test_fetch.py 2018-01-12 08:52:43 +0000
63+++ breezy/tests/per_repository/test_fetch.py 2018-03-09 00:04:33 +0000
64@@ -126,6 +126,9 @@
65 remote_format = isinstance(repo, remote.RemoteRepository)
66 if not repo._format.rich_root_data and not remote_format:
67 return # not relevant
68+ if not repo._format.supports_full_versioned_files:
69+ raise TestNotApplicable(
70+ 'format does not support full versioned files')
71 builder = self.make_branch_builder('source', format='1.9')
72 builder.start_series()
73 for revision_id, parent_ids, actions in snapshots:
74
75=== modified file 'breezy/tests/per_workingtree/test_workingtree.py'
76--- breezy/tests/per_workingtree/test_workingtree.py 2018-03-04 02:57:55 +0000
77+++ breezy/tests/per_workingtree/test_workingtree.py 2018-03-09 00:04:33 +0000
78@@ -1203,8 +1203,8 @@
79 # tricky to figure out how to create an illegal filename.
80 # \xb5 is an illegal path because it should be \xc2\xb5 for UTF-8
81 tree = self.make_branch_and_tree('tree')
82- self.build_tree(['tree/subdir/'])
83- tree.add('subdir')
84+ self.build_tree(['tree/subdir/', 'tree/subdir/somefile'])
85+ tree.add(['subdir', 'subdir/somefile'])
86
87 f = open('tree/subdir/m\xb5', 'wb')
88 try:
89@@ -1220,7 +1220,7 @@
90
91 e = self.assertListRaises(errors.BadFilenameEncoding,
92 tree.iter_changes, tree.basis_tree(),
93- want_unversioned=True)
94+ want_unversioned=True)
95 # We should display the relative path
96 self.assertEqual('subdir/m\xb5', e.filename)
97 self.assertEqual(osutils._fs_enc, e.fs_encoding)

Subscribers

People subscribed via source and target branches