loggerhead

Merge lp:~jelmer/loggerhead/teyit into lp:loggerhead

  1. teyit
  2. Merge into trunk-rich
Proposed by Jelmer Vernooij
Status: Merged
Approved by: Colin Watson
Approved revision: 546
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: lp:~jelmer/loggerhead/teyit
Merge into: lp:loggerhead
Diff against target: 113 lines (+18/-15)
6 files modified
loggerhead/tests/test_controllers.py (+2/-2)
loggerhead/tests/test_corners.py (+1/-1)
loggerhead/tests/test_history.py (+6/-6)
loggerhead/tests/test_load_test.py (+1/-1)
loggerhead/tests/test_revision_ui.py (+1/-1)
loggerhead/tests/test_simple.py (+7/-4)
To merge this branch: bzr merge lp:~jelmer/loggerhead/teyit
Reviewer Review Type Date Requested Status
Colin Watson (community) Approve
Review via email: mp+436709@code.launchpad.net

Commit message

Improve unittest calls

Description of the change

Improve unittest calls

reformatted loggerhead/tests/test_revision_ui.py
reformatted loggerhead/tests/test_history.py
reformatted loggerhead/tests/test_simple.py
reformatted loggerhead/tests/test_corners.py
reformatted loggerhead/tests/test_load_test.py
reformatted loggerhead/tests/test_controllers.py
All done! 6 reformatted, 5 left unchanged

To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'loggerhead/tests/test_controllers.py'
2--- loggerhead/tests/test_controllers.py 2023-01-31 19:08:09 +0000
3+++ loggerhead/tests/test_controllers.py 2023-02-01 18:14:51 +0000
4@@ -154,7 +154,7 @@
5 path = revision_ui.parse_args(env)
6 values = revision_ui.get_values(path, revision_ui.kwargs, {})
7 revision_ui.add_template_values(values)
8- self.assertIs(values['diff_chunks'], None)
9+ self.assertIsNone(values['diff_chunks'])
10
11 def test_add_template_values_with_changes(self):
12 branch_app = self.make_branch_app_for_revision_ui(
13@@ -400,7 +400,7 @@
14 self.addCleanup(BranchWSGIApp.hooks.uninstall_named_hook, 'controller',
15 'captain hook')
16 BranchWSGIApp.hooks.install_named_hook('controller', myhook, "captain hook")
17- self.assertEquals("I am hooked", app.lookup_app(env))
18+ self.assertEqual("I am hooked", app.lookup_app(env))
19
20
21 class MatchesDownloadHeaders(Matcher):
22
23=== modified file 'loggerhead/tests/test_corners.py'
24--- loggerhead/tests/test_corners.py 2018-10-20 15:28:43 +0000
25+++ loggerhead/tests/test_corners.py 2023-02-01 18:14:51 +0000
26@@ -44,7 +44,7 @@
27 self.addFileAndCommit('myfilename', msg)
28 app = self.setUpLoggerhead()
29 res = app.get('/revision/1')
30- self.assertFalse(msg in res.body)
31+ self.assertNotIn(msg, res.body)
32
33 def test_empty_commit_message(self):
34 """Check that an empty commit message does not break the rendering."""
35
36=== modified file 'loggerhead/tests/test_history.py'
37--- loggerhead/tests/test_history.py 2023-01-31 19:08:09 +0000
38+++ loggerhead/tests/test_history.py 2023-02-01 18:14:51 +0000
39@@ -304,9 +304,9 @@
40 def test_native(self):
41 history, revs = self.make_linear_ancestry()
42 changes = history.get_changes_uncached([revs[0], revs[1]])
43- self.assertEquals(2, len(changes))
44- self.assertEquals(revs[0], changes[0].revid)
45- self.assertEquals(revs[1], changes[1].revid)
46+ self.assertEqual(2, len(changes))
47+ self.assertEqual(revs[0], changes[0].revid)
48+ self.assertEqual(revs[1], changes[1].revid)
49 self.assertIs(None, getattr(changes[0], 'foreign_vcs', None))
50 self.assertIs(None, getattr(changes[0], 'foreign_revid', None))
51
52@@ -320,6 +320,6 @@
53 "revid-in-bzr", message="message",
54 timestamp=234423423.3)
55 change = history._change_from_revision(foreign_rev)
56- self.assertEquals('revid-in-bzr', change.revid)
57- self.assertEquals("('uuid', 1234)", change.foreign_revid)
58- self.assertEquals("vcs", change.foreign_vcs)
59+ self.assertEqual('revid-in-bzr', change.revid)
60+ self.assertEqual("('uuid', 1234)", change.foreign_revid)
61+ self.assertEqual("vcs", change.foreign_vcs)
62
63=== modified file 'loggerhead/tests/test_load_test.py'
64--- loggerhead/tests/test_load_test.py 2023-01-31 19:08:09 +0000
65+++ loggerhead/tests/test_load_test.py 2023-02-01 18:14:51 +0000
66@@ -216,7 +216,7 @@
67 # If an id is found, then we should create it
68 self.assertEqual({}, script._threads)
69 worker = script._get_worker('id')
70- self.assertTrue('id' in script._threads)
71+ self.assertIn('id', script._threads)
72 # We should have set the blocking timeout
73 self.assertEqual(script.blocking_timeout / 10.0,
74 worker.blocking_time)
75
76=== modified file 'loggerhead/tests/test_revision_ui.py'
77--- loggerhead/tests/test_revision_ui.py 2018-10-20 15:02:08 +0000
78+++ loggerhead/tests/test_revision_ui.py 2023-02-01 18:14:51 +0000
79@@ -44,4 +44,4 @@
80 # and the Authors are connected. However, that requires asserting the
81 # exact HTML connections, which I wanted to avoid.
82 res.mustcontain('Committer', 'Joe Example')
83- self.assertFalse(b'Author(s)' in res.body)
84+ self.assertNotIn(b'Author(s)', res.body)
85
86=== modified file 'loggerhead/tests/test_simple.py'
87--- loggerhead/tests/test_simple.py 2023-01-31 19:08:09 +0000
88+++ loggerhead/tests/test_simple.py 2023-02-01 18:14:51 +0000
89@@ -98,8 +98,8 @@
90 def test_changes_branch_from(self):
91 app = self.setUpLoggerhead(served_url="lp:loggerhead")
92 res = app.get('/changes')
93- self.failUnless("To get this branch, use:" in res)
94- self.failUnless("lp:loggerhead" in res)
95+ self.assertIn("To get this branch, use:", res)
96+ self.assertIn("lp:loggerhead", res)
97
98 def test_changes_search(self):
99 app = self.setUpLoggerhead()
100@@ -121,8 +121,11 @@
101 body_no_span = body_no_span.replace(b'</span>', b'')
102 for line in self.filecontents.splitlines():
103 escaped = escape(line).encode('utf-8')
104- self.assertTrue(escaped in body_no_span,
105- "did not find %r in %r" % (escaped, body_no_span))
106+ self.assertIn(
107+ escaped,
108+ body_no_span,
109+ "did not find %r in %r" % (escaped, body_no_span)
110+ )
111
112 def test_inventory(self):
113 app = self.setUpLoggerhead()

Subscribers

People subscribed via source and target branches