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
1=== modified file 'loggerhead/controllers/view_ui.py'
2--- loggerhead/controllers/view_ui.py 2023-01-31 19:08:09 +0000
3+++ loggerhead/controllers/view_ui.py 2023-09-17 11:16:22 +0000
4@@ -64,12 +64,12 @@
5 encoding = 'iso-8859-15'
6 file_text.decode(encoding)
7
8- file_lines = osutils.split_lines(file_text)
9+ file_lines = file_text.splitlines(True)
10 # This can throw breezy.errors.BinaryFile (which our caller catches).
11 breezy.textfile.check_text_lines(file_lines)
12
13 file_text = file_text.decode(encoding)
14- file_lines = osutils.split_lines(file_text)
15+ file_lines = file_text.splitlines(True)
16
17 if highlight is not None:
18 hl_lines = highlight(file_name, file_text, encoding)
19
20=== modified file 'loggerhead/highlight.py'
21--- loggerhead/highlight.py 2023-01-31 19:08:09 +0000
22+++ loggerhead/highlight.py 2023-09-17 11:16:22 +0000
23@@ -37,7 +37,7 @@
24 """
25
26 if len(text) > MAX_HIGHLIGHT_SIZE:
27- return list(map(escape, breezy.osutils.split_lines(text)))
28+ return list(map(escape, text.splitlines()))
29
30 formatter = HtmlFormatter(style=style, nowrap=True, classprefix='pyg-')
31
32@@ -50,6 +50,6 @@
33 lexer = TextLexer(encoding=encoding)
34
35 hl_lines = _highlight_func(text, lexer, formatter)
36- hl_lines = breezy.osutils.split_lines(hl_lines)
37+ hl_lines = "".join(hl_lines).splitlines(True)
38
39 return hl_lines
40
41=== modified file 'loggerhead/tests/test_highlight.py'
42--- loggerhead/tests/test_highlight.py 2022-04-03 12:41:18 +0000
43+++ loggerhead/tests/test_highlight.py 2023-09-17 11:16:22 +0000
44@@ -30,4 +30,4 @@
45 self.assertLength(102401, rv)
46 # no highlighting applied
47 for item in rv:
48- self.assertEqual("text\n", item)
49+ self.assertEqual("text", item)
50
51=== modified file 'loggerhead/tests/test_history.py'
52--- loggerhead/tests/test_history.py 2023-02-02 19:52:38 +0000
53+++ loggerhead/tests/test_history.py 2023-09-17 11:16:22 +0000
54@@ -317,9 +317,10 @@
55 foreign_vcs = ForeignVcs(None, "vcs")
56 foreign_vcs.show_foreign_revid = repr
57 foreign_rev = ForeignRevision(("uuid", 1234), VcsMapping(foreign_vcs),
58- "revid-in-bzr", message="message",
59- timestamp=234423423.3)
60+ b"revid-in-bzr", message="message",
61+ timestamp=234423423.3, parent_ids=[], committer="Joe Example <joe@example.com>",
62+ properties={})
63 change = history._change_from_revision(foreign_rev)
64- self.assertEqual('revid-in-bzr', change.revid)
65+ self.assertEqual(b'revid-in-bzr', change.revid)
66 self.assertEqual("('uuid', 1234)", change.foreign_revid)
67 self.assertEqual("vcs", change.foreign_vcs)

Subscribers

People subscribed via source and target branches