loggerhead

Merge lp:~jelmer/loggerhead/fix-tests into lp:loggerhead

  1. fix-tests
  2. Merge into trunk-rich
Proposed by Jelmer Vernooij
Status: Needs review
Proposed branch: lp:~jelmer/loggerhead/fix-tests
Merge into: lp:loggerhead
Diff against target: 67 lines (+9/-8)
4 files modified
loggerhead/controllers/view_ui.py (+2/-2)
loggerhead/highlight.py (+2/-2)
loggerhead/tests/test_highlight.py (+1/-1)
loggerhead/tests/test_history.py (+4/-3)
To merge this branch: bzr merge lp:~jelmer/loggerhead/fix-tests
Reviewer Review Type Date Requested Status
Loggerhead Reviewers Pending
Review via email: mp+451484@code.launchpad.net

Description of the change

Fix tests with upcoming versions of Breezy

To post a comment you must log in.

Unmerged revisions

549. By Jelmer Vernooij

Fix tests with newer versions of Breezy

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'loggerhead/controllers/view_ui.py'
--- loggerhead/controllers/view_ui.py 2023-01-31 19:08:09 +0000
+++ loggerhead/controllers/view_ui.py 2023-09-17 11:16:22 +0000
@@ -64,12 +64,12 @@
64 encoding = 'iso-8859-15'64 encoding = 'iso-8859-15'
65 file_text.decode(encoding)65 file_text.decode(encoding)
6666
67 file_lines = osutils.split_lines(file_text)67 file_lines = file_text.splitlines(True)
68 # This can throw breezy.errors.BinaryFile (which our caller catches).68 # This can throw breezy.errors.BinaryFile (which our caller catches).
69 breezy.textfile.check_text_lines(file_lines)69 breezy.textfile.check_text_lines(file_lines)
7070
71 file_text = file_text.decode(encoding)71 file_text = file_text.decode(encoding)
72 file_lines = osutils.split_lines(file_text)72 file_lines = file_text.splitlines(True)
7373
74 if highlight is not None:74 if highlight is not None:
75 hl_lines = highlight(file_name, file_text, encoding)75 hl_lines = highlight(file_name, file_text, encoding)
7676
=== modified file 'loggerhead/highlight.py'
--- loggerhead/highlight.py 2023-01-31 19:08:09 +0000
+++ loggerhead/highlight.py 2023-09-17 11:16:22 +0000
@@ -37,7 +37,7 @@
37 """37 """
3838
39 if len(text) > MAX_HIGHLIGHT_SIZE:39 if len(text) > MAX_HIGHLIGHT_SIZE:
40 return list(map(escape, breezy.osutils.split_lines(text)))40 return list(map(escape, text.splitlines()))
4141
42 formatter = HtmlFormatter(style=style, nowrap=True, classprefix='pyg-')42 formatter = HtmlFormatter(style=style, nowrap=True, classprefix='pyg-')
4343
@@ -50,6 +50,6 @@
50 lexer = TextLexer(encoding=encoding)50 lexer = TextLexer(encoding=encoding)
5151
52 hl_lines = _highlight_func(text, lexer, formatter)52 hl_lines = _highlight_func(text, lexer, formatter)
53 hl_lines = breezy.osutils.split_lines(hl_lines)53 hl_lines = "".join(hl_lines).splitlines(True)
5454
55 return hl_lines55 return hl_lines
5656
=== modified file 'loggerhead/tests/test_highlight.py'
--- loggerhead/tests/test_highlight.py 2022-04-03 12:41:18 +0000
+++ loggerhead/tests/test_highlight.py 2023-09-17 11:16:22 +0000
@@ -30,4 +30,4 @@
30 self.assertLength(102401, rv)30 self.assertLength(102401, rv)
31 # no highlighting applied31 # no highlighting applied
32 for item in rv:32 for item in rv:
33 self.assertEqual("text\n", item)33 self.assertEqual("text", item)
3434
=== modified file 'loggerhead/tests/test_history.py'
--- loggerhead/tests/test_history.py 2023-02-02 19:52:38 +0000
+++ loggerhead/tests/test_history.py 2023-09-17 11:16:22 +0000
@@ -317,9 +317,10 @@
317 foreign_vcs = ForeignVcs(None, "vcs")317 foreign_vcs = ForeignVcs(None, "vcs")
318 foreign_vcs.show_foreign_revid = repr318 foreign_vcs.show_foreign_revid = repr
319 foreign_rev = ForeignRevision(("uuid", 1234), VcsMapping(foreign_vcs),319 foreign_rev = ForeignRevision(("uuid", 1234), VcsMapping(foreign_vcs),
320 "revid-in-bzr", message="message",320 b"revid-in-bzr", message="message",
321 timestamp=234423423.3)321 timestamp=234423423.3, parent_ids=[], committer="Joe Example <joe@example.com>",
322 properties={})
322 change = history._change_from_revision(foreign_rev)323 change = history._change_from_revision(foreign_rev)
323 self.assertEqual('revid-in-bzr', change.revid)324 self.assertEqual(b'revid-in-bzr', change.revid)
324 self.assertEqual("('uuid', 1234)", change.foreign_revid)325 self.assertEqual("('uuid', 1234)", change.foreign_revid)
325 self.assertEqual("vcs", change.foreign_vcs)326 self.assertEqual("vcs", change.foreign_vcs)

Subscribers

People subscribed via source and target branches