Mercurial > public > mercurial-scm > hg
diff tests/test-simplemerge.py @ 10413:e433002acb05
fix up a bunch of check-code warnings
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Tue, 09 Feb 2010 14:12:22 -0600 |
| parents | 08a0f04b56bd |
| children | 7de7630053cb |
line wrap: on
line diff
--- a/tests/test-simplemerge.py Tue Feb 09 13:53:24 2010 -0600 +++ b/tests/test-simplemerge.py Tue Feb 09 14:12:22 2010 -0600 @@ -143,7 +143,7 @@ # to match without zz self.assertEquals(list(m3.find_sync_regions()), [(0, 1, 2, 3, 0, 1), - (1, 1, 3, 3, 1, 1),]) + (1, 1, 3, 3, 1, 1)]) self.assertEquals(list(m3.merge_regions()), [('a', 0, 2), @@ -180,12 +180,12 @@ self.assertEquals(list(m3.find_sync_regions()), [(0, 1, 0, 1, 0, 1), (1, 2, 2, 3, 1, 2), - (2, 2, 3, 3, 2, 2),]) + (2, 2, 3, 3, 2, 2)]) self.assertEquals(list(m3.merge_regions()), [('unchanged', 0, 1), ('a', 1, 2), - ('unchanged', 1, 2),]) + ('unchanged', 1, 2)]) def test_append_a(self): m3 = Merge3(['aaa\n', 'bbb\n'], @@ -256,7 +256,7 @@ self.assertEquals(list(m3.find_sync_regions()), [(0, 1, 0, 1, 0, 1), (1, 2, 2, 3, 2, 3), - (2, 2, 3, 3, 3, 3),]) + (2, 2, 3, 3, 3, 3)]) self.assertEquals(list(m3.merge_regions()), [('unchanged', 0, 1), @@ -296,7 +296,7 @@ self.assertEquals(list(m3.find_sync_regions()), [(0, 1, 0, 1, 0, 1), (2, 3, 2, 3, 2, 3), - (3, 3, 3, 3, 3, 3),]) + (3, 3, 3, 3, 3, 3)]) def test_replace_multi(self): """Replacement with regions of different size."""