Breezy

Merge lp:~jelmer/brz/fix-changelog-merge into lp:brz

  1. fix-changelog-merge
  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/fix-changelog-merge
Merge into: lp:brz
Diff against target: 26 lines (+4/-1)
2 files modified
breezy/plugins/changelog_merge/tests/test_changelog_merge.py (+3/-1)
python3.passing (+1/-0)
To merge this branch: bzr merge lp:~jelmer/brz/fix-changelog-merge
Reviewer Review Type Date Requested Status
Martin Packman Approve
Review via email: mp+353609@code.launchpad.net

Description of the change

Fix changelog merge tests on Python 3.

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

Okay.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'breezy/plugins/changelog_merge/tests/test_changelog_merge.py'
2--- breezy/plugins/changelog_merge/tests/test_changelog_merge.py 2018-07-08 15:47:10 +0000
3+++ breezy/plugins/changelog_merge/tests/test_changelog_merge.py 2018-08-23 00:38:48 +0000
4@@ -148,7 +148,9 @@
5 # for now we just give up.)
6 self.assertRaises(changelog_merge.EntryConflict,
7 changelog_merge.merge_entries,
8- sample2_base_entries, [], sample2_other_entries)
9+ [(entry, ) for entry in sample2_base_entries],
10+ [],
11+ [(entry, ) for entry in sample2_other_entries])
12
13 def test_default_guess_edits(self):
14 """default_guess_edits matches a new entry only once.
15
16=== modified file 'python3.passing'
17--- python3.passing 2018-08-22 00:34:58 +0000
18+++ python3.passing 2018-08-23 00:38:48 +0000
19@@ -343,6 +343,7 @@
20 breezy.plugins.changelog_merge.tests.test_changelog_merge.TestMergeCoreLogic.test_default_guess_edits
21 breezy.plugins.changelog_merge.tests.test_changelog_merge.TestMergeCoreLogic.test_more_complex_conflict
22 breezy.plugins.changelog_merge.tests.test_changelog_merge.TestMergeCoreLogic.test_new_in_other_floats_to_top
23+breezy.plugins.changelog_merge.tests.test_changelog_merge.TestMergeCoreLogic.test_too_hard
24 breezy.plugins.commitfromnews.tests.test_committemplate.TestCommitTemplate.test_added_NEWS
25 breezy.plugins.commitfromnews.tests.test_committemplate.TestCommitTemplate.test_changed_NEWS
26 breezy.plugins.commitfromnews.tests.test_committemplate.TestCommitTemplate.test_fix_bug

Subscribers

People subscribed via source and target branches