Merge lp:~jelmer/brz/python3-log-more into lp:brz

Proposed by Jelmer Vernooij on 2018-08-14
Status: Merged
Approved by: Jelmer Vernooij on 2018-08-20
Approved revision: 7068
Merge reported by: The Breezy Bot
Merged at revision: not available
Proposed branch: lp:~jelmer/brz/python3-log-more
Merge into: lp:brz
Diff against target: 53 lines (+7/-4)
2 files modified
breezy/tests/blackbox/test_log.py (+4/-4)
python3.passing (+3/-0)
To merge this branch: bzr merge lp:~jelmer/brz/python3-log-more
Reviewer Review Type Date Requested Status
Martin Packman 2018-08-14 Approve on 2018-08-20
Review via email: mp+353126@code.launchpad.net

Description of the change

Fix some log tests on Python 3.

To post a comment you must log in.
Martin Packman (gz) wrote :

Thanks.

review: Approve
The Breezy Bot (the-breezy-bot) wrote :

Running landing tests failed
https://ci.breezy-vcs.org/job/land-brz/396/

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'breezy/tests/blackbox/test_log.py'
2--- breezy/tests/blackbox/test_log.py 2018-07-27 01:17:23 +0000
3+++ breezy/tests/blackbox/test_log.py 2018-08-14 21:52:22 +0000
4@@ -632,7 +632,7 @@
5 self.wt_commit(level0, 'merge branch level1')
6
7 def _diff_file1_revno1(self):
8- return """=== added file 'file1'
9+ return b"""=== added file 'file1'
10 --- file1\t1970-01-01 00:00:00 +0000
11 +++ file1\t2005-11-22 00:00:00 +0000
12 @@ -0,0 +1,1 @@
13@@ -641,7 +641,7 @@
14 """
15
16 def _diff_file2_revno2(self):
17- return """=== modified file 'file2'
18+ return b"""=== modified file 'file2'
19 --- file2\t2005-11-22 00:00:00 +0000
20 +++ file2\t2005-11-22 00:00:01 +0000
21 @@ -1,1 +1,1 @@
22@@ -651,7 +651,7 @@
23 """
24
25 def _diff_file2_revno1_1_1(self):
26- return """=== modified file 'file2'
27+ return b"""=== modified file 'file2'
28 --- file2\t2005-11-22 00:00:00 +0000
29 +++ file2\t2005-11-22 00:00:01 +0000
30 @@ -1,1 +1,1 @@
31@@ -661,7 +661,7 @@
32 """
33
34 def _diff_file2_revno1(self):
35- return """=== added file 'file2'
36+ return b"""=== added file 'file2'
37 --- file2\t1970-01-01 00:00:00 +0000
38 +++ file2\t2005-11-22 00:00:00 +0000
39 @@ -0,0 +1,1 @@
40
41=== modified file 'python3.passing'
42--- python3.passing 2018-08-08 02:10:06 +0000
43+++ python3.passing 2018-08-14 21:52:22 +0000
44@@ -1853,6 +1853,9 @@
45 breezy.tests.blackbox.test_log.Test_GenerateAllRevisions.test_no_start_rev_id_with_end_rev_id_being_a_merge
46 breezy.tests.blackbox.test_log.Test_GenerateAllRevisions.test_not_an_ancestor
47 breezy.tests.blackbox.test_log.Test_GenerateAllRevisions.test_wrong_order
48+breezy.tests.blackbox.test_log.TestLogDiff.test_log_diff_file1
49+breezy.tests.blackbox.test_log.TestLogDiff.test_log_diff_file2
50+breezy.tests.blackbox.test_log.TestLogDiff.test_log_diff_with_merges
51 breezy.tests.blackbox.test_log.TestLogEncodings.test_log_handles_bad_encoding
52 breezy.tests.blackbox.test_log.TestLogEncodings.test_log_handles_encoding
53 breezy.tests.blackbox.test_log.TestLogErrors.test_log_bad_message_re

Subscribers

People subscribed via source and target branches