Mercurial > public > mercurial-scm > hg-stable
diff tests/test-annotate.py @ 43076:2372284d9457
formatting: blacken the codebase
This is using my patch to black
(https://github.com/psf/black/pull/826) so we don't un-wrap collection
literals.
Done with:
hg files 'set:**.py - mercurial/thirdparty/** - "contrib/python-zstandard/**"' | xargs black -S
# skip-blame mass-reformatting only
# no-check-commit reformats foo_bar functions
Differential Revision: https://phab.mercurial-scm.org/D6971
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Sun, 06 Oct 2019 09:45:02 -0400 |
| parents | 434e520adb8c |
| children | 6000f5b25c9b |
line wrap: on
line diff
--- a/tests/test-annotate.py Sat Oct 05 10:29:34 2019 -0400 +++ b/tests/test-annotate.py Sun Oct 06 09:45:02 2019 -0400 @@ -13,15 +13,19 @@ _annotatepair, ) + def tr(a): - return [annotateline(fctx, lineno, skip) - for fctx, lineno, skip in zip(a.fctxs, a.linenos, a.skips)] + return [ + annotateline(fctx, lineno, skip) + for fctx, lineno, skip in zip(a.fctxs, a.linenos, a.skips) + ] + class AnnotateTests(unittest.TestCase): """Unit tests for annotate code.""" def testannotatepair(self): - self.maxDiff = None # camelcase-required + self.maxDiff = None # camelcase-required oldfctx = b'old' p1fctx, p2fctx, childfctx = b'p1', b'p2', b'c' @@ -41,70 +45,94 @@ oldann = decorate(olddata, oldfctx) p1ann = decorate(p1data, p1fctx) p1ann = _annotatepair([oldann], p1fctx, p1ann, False, diffopts) - self.assertEqual(tr(p1ann), [ - annotateline(b'old', 1), - annotateline(b'old', 2), - annotateline(b'p1', 3), - ]) + self.assertEqual( + tr(p1ann), + [ + annotateline(b'old', 1), + annotateline(b'old', 2), + annotateline(b'p1', 3), + ], + ) p2ann = decorate(p2data, p2fctx) p2ann = _annotatepair([oldann], p2fctx, p2ann, False, diffopts) - self.assertEqual(tr(p2ann), [ - annotateline(b'old', 1), - annotateline(b'p2', 2), - annotateline(b'p2', 3), - ]) + self.assertEqual( + tr(p2ann), + [ + annotateline(b'old', 1), + annotateline(b'p2', 2), + annotateline(b'p2', 3), + ], + ) # Test with multiple parents (note the difference caused by ordering) childann = decorate(childdata, childfctx) - childann = _annotatepair([p1ann, p2ann], childfctx, childann, False, - diffopts) - self.assertEqual(tr(childann), [ - annotateline(b'old', 1), - annotateline(b'c', 2), - annotateline(b'p2', 2), - annotateline(b'c', 4), - annotateline(b'p2', 3), - ]) + childann = _annotatepair( + [p1ann, p2ann], childfctx, childann, False, diffopts + ) + self.assertEqual( + tr(childann), + [ + annotateline(b'old', 1), + annotateline(b'c', 2), + annotateline(b'p2', 2), + annotateline(b'c', 4), + annotateline(b'p2', 3), + ], + ) childann = decorate(childdata, childfctx) - childann = _annotatepair([p2ann, p1ann], childfctx, childann, False, - diffopts) - self.assertEqual(tr(childann), [ - annotateline(b'old', 1), - annotateline(b'c', 2), - annotateline(b'p1', 3), - annotateline(b'c', 4), - annotateline(b'p2', 3), - ]) + childann = _annotatepair( + [p2ann, p1ann], childfctx, childann, False, diffopts + ) + self.assertEqual( + tr(childann), + [ + annotateline(b'old', 1), + annotateline(b'c', 2), + annotateline(b'p1', 3), + annotateline(b'c', 4), + annotateline(b'p2', 3), + ], + ) # Test with skipchild (note the difference caused by ordering) childann = decorate(childdata, childfctx) - childann = _annotatepair([p1ann, p2ann], childfctx, childann, True, - diffopts) - self.assertEqual(tr(childann), [ - annotateline(b'old', 1), - annotateline(b'old', 2, True), - # note that this line was carried over from earlier so it is *not* - # marked skipped - annotateline(b'p2', 2), - annotateline(b'p2', 2, True), - annotateline(b'p2', 3), - ]) + childann = _annotatepair( + [p1ann, p2ann], childfctx, childann, True, diffopts + ) + self.assertEqual( + tr(childann), + [ + annotateline(b'old', 1), + annotateline(b'old', 2, True), + # note that this line was carried over from earlier so it is *not* + # marked skipped + annotateline(b'p2', 2), + annotateline(b'p2', 2, True), + annotateline(b'p2', 3), + ], + ) childann = decorate(childdata, childfctx) - childann = _annotatepair([p2ann, p1ann], childfctx, childann, True, - diffopts) - self.assertEqual(tr(childann), [ - annotateline(b'old', 1), - annotateline(b'old', 2, True), - annotateline(b'p1', 3), - annotateline(b'p1', 3, True), - annotateline(b'p2', 3), - ]) + childann = _annotatepair( + [p2ann, p1ann], childfctx, childann, True, diffopts + ) + self.assertEqual( + tr(childann), + [ + annotateline(b'old', 1), + annotateline(b'old', 2, True), + annotateline(b'p1', 3), + annotateline(b'p1', 3, True), + annotateline(b'p2', 3), + ], + ) + if __name__ == '__main__': import silenttestrunner + silenttestrunner.main(__name__)