Merge lp:~jelmer/brz/testr-tree-description into lp:brz

Proposed by Jelmer Vernooij
Status: Merged
Approved by: Jelmer Vernooij
Approved revision: no longer in the source branch.
Merge reported by: Vincent Ladeuil
Merged at revision: not available
Proposed branch: lp:~jelmer/brz/testr-tree-description
Merge into: lp:brz
Diff against target: 16 lines (+3/-1)
1 file modified
breezy/tests/test_info.py (+3/-1)
To merge this branch: bzr merge lp:~jelmer/brz/testr-tree-description
Reviewer Review Type Date Requested Status
Martin Packman Approve
Review via email: mp+340027@code.launchpad.net

Commit message

Don't attempt to test tree description for control formats that don't support trees.

Description of the change

Don't attempt to test tree description for control formats that don't support trees.

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/test_info.py'
2--- breezy/tests/test_info.py 2017-06-10 16:40:42 +0000
3+++ breezy/tests/test_info.py 2018-02-27 15:19:32 +0000
4@@ -137,9 +137,11 @@
5 repo, None, None))
6
7 def test_describe_tree_format(self):
8- for key in controldir.format_registry.keys():
9+ for key, format in controldir.format_registry.iteritems():
10 if key in controldir.format_registry.aliases():
11 continue
12+ if not format().supports_workingtrees:
13+ continue
14 self.assertTreeDescription(key)
15
16 def test_describe_checkout_format(self):

Subscribers

People subscribed via source and target branches