Breezy

Merge lp:~jelmer/brz/avoid-inventory into lp:brz

  1. avoid-inventory
  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/avoid-inventory
Merge into: lp:brz
Diff against target: 12 lines (+1/-1)
1 file modified
breezy/tests/per_repository/test_commit_builder.py (+1/-1)
To merge this branch: bzr merge lp:~jelmer/brz/avoid-inventory
Reviewer Review Type Date Requested Status
Martin Packman Approve
Review via email: mp+341077@code.launchpad.net

Commit message

Various foreign-branch related fixes to CommitBuilder tests.

Description of the change

Improve commit builder tests:

* Avoid relying on inventory being present on RevisionTree
* Call CommitBuilder.abort() only until CommitBuilder.commit() has finished.
  Calling it before/after can cause other exceptions to be masked.

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

Thanks.

review: Approve
Revision history for this message
The Breezy Bot (the-breezy-bot) wrote :

Merging failed
https://ci.breezy-vcs.org/job/brz-dev/50/

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-03-24 02:28:49 +0000
3+++ breezy/tests/per_repository/test_commit_builder.py 2018-03-24 02:42:59 +0000
4@@ -461,7 +461,7 @@
5 """Perform a miniature commit looking for record entry results.
6
7 This version uses the record_iter_changes interface.
8-
9+
10 :param tree: The tree to commit.
11 :param name: The path in the basis tree of the tree being committed.
12 :param new_name: The path in the tree being committed.

Subscribers

People subscribed via source and target branches