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
=== modified file 'breezy/tests/blackbox/test_log.py'
--- breezy/tests/blackbox/test_log.py 2018-07-27 01:17:23 +0000
+++ breezy/tests/blackbox/test_log.py 2018-08-14 21:52:22 +0000
@@ -632,7 +632,7 @@
632 self.wt_commit(level0, 'merge branch level1')632 self.wt_commit(level0, 'merge branch level1')
633633
634 def _diff_file1_revno1(self):634 def _diff_file1_revno1(self):
635 return """=== added file 'file1'635 return b"""=== added file 'file1'
636--- file1\t1970-01-01 00:00:00 +0000636--- file1\t1970-01-01 00:00:00 +0000
637+++ file1\t2005-11-22 00:00:00 +0000637+++ file1\t2005-11-22 00:00:00 +0000
638@@ -0,0 +1,1 @@638@@ -0,0 +1,1 @@
@@ -641,7 +641,7 @@
641"""641"""
642642
643 def _diff_file2_revno2(self):643 def _diff_file2_revno2(self):
644 return """=== modified file 'file2'644 return b"""=== modified file 'file2'
645--- file2\t2005-11-22 00:00:00 +0000645--- file2\t2005-11-22 00:00:00 +0000
646+++ file2\t2005-11-22 00:00:01 +0000646+++ file2\t2005-11-22 00:00:01 +0000
647@@ -1,1 +1,1 @@647@@ -1,1 +1,1 @@
@@ -651,7 +651,7 @@
651"""651"""
652652
653 def _diff_file2_revno1_1_1(self):653 def _diff_file2_revno1_1_1(self):
654 return """=== modified file 'file2'654 return b"""=== modified file 'file2'
655--- file2\t2005-11-22 00:00:00 +0000655--- file2\t2005-11-22 00:00:00 +0000
656+++ file2\t2005-11-22 00:00:01 +0000656+++ file2\t2005-11-22 00:00:01 +0000
657@@ -1,1 +1,1 @@657@@ -1,1 +1,1 @@
@@ -661,7 +661,7 @@
661"""661"""
662662
663 def _diff_file2_revno1(self):663 def _diff_file2_revno1(self):
664 return """=== added file 'file2'664 return b"""=== added file 'file2'
665--- file2\t1970-01-01 00:00:00 +0000665--- file2\t1970-01-01 00:00:00 +0000
666+++ file2\t2005-11-22 00:00:00 +0000666+++ file2\t2005-11-22 00:00:00 +0000
667@@ -0,0 +1,1 @@667@@ -0,0 +1,1 @@
668668
=== modified file 'python3.passing'
--- python3.passing 2018-08-08 02:10:06 +0000
+++ python3.passing 2018-08-14 21:52:22 +0000
@@ -1853,6 +1853,9 @@
1853breezy.tests.blackbox.test_log.Test_GenerateAllRevisions.test_no_start_rev_id_with_end_rev_id_being_a_merge1853breezy.tests.blackbox.test_log.Test_GenerateAllRevisions.test_no_start_rev_id_with_end_rev_id_being_a_merge
1854breezy.tests.blackbox.test_log.Test_GenerateAllRevisions.test_not_an_ancestor1854breezy.tests.blackbox.test_log.Test_GenerateAllRevisions.test_not_an_ancestor
1855breezy.tests.blackbox.test_log.Test_GenerateAllRevisions.test_wrong_order1855breezy.tests.blackbox.test_log.Test_GenerateAllRevisions.test_wrong_order
1856breezy.tests.blackbox.test_log.TestLogDiff.test_log_diff_file1
1857breezy.tests.blackbox.test_log.TestLogDiff.test_log_diff_file2
1858breezy.tests.blackbox.test_log.TestLogDiff.test_log_diff_with_merges
1856breezy.tests.blackbox.test_log.TestLogEncodings.test_log_handles_bad_encoding1859breezy.tests.blackbox.test_log.TestLogEncodings.test_log_handles_bad_encoding
1857breezy.tests.blackbox.test_log.TestLogEncodings.test_log_handles_encoding1860breezy.tests.blackbox.test_log.TestLogEncodings.test_log_handles_encoding
1858breezy.tests.blackbox.test_log.TestLogErrors.test_log_bad_message_re1861breezy.tests.blackbox.test_log.TestLogErrors.test_log_bad_message_re

Subscribers

People subscribed via source and target branches