Mercurial > public > mercurial-scm > python-hglib

comparison tests/test_resolve.py @ 221:a2afbf236ca8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hglib tests: remove deprecated constructions This mostly removes usage of 'assertEquals' (replaced with 'assertEqual'), as well as opening files without closing them (fixed using a 'with' statement).
author Mathias De Mare <mathias.de_mare@nokia.com>
date Thu, 09 Mar 2023 14:00:02 +0100
parents 8341f2494b3f
children
comparison
equal deleted inserted replaced
220:ae6427d1c8f7 221:a2afbf236ca8
23 self.assertRaises(hglib.error.CommandError, self.client.merge, 23 self.assertRaises(hglib.error.CommandError, self.client.merge,
24 self.node1) 24 self.node1)
25 self.assertRaises(hglib.error.CommandError, 25 self.assertRaises(hglib.error.CommandError,
26 self.client.resolve, all=True) 26 self.client.resolve, all=True)
27 27
28 self.assertEquals([(b('U'), b('a')), (b('U'), b('b'))], 28 self.assertEqual([(b('U'), b('a')), (b('U'), b('b'))],
29 self.client.resolve(listfiles=True)) 29 self.client.resolve(listfiles=True))
30 30
31 self.client.resolve(b('a'), mark=True) 31 self.client.resolve(b('a'), mark=True)
32 self.assertEquals([(b('R'), b('a')), (b('U'), b('b'))], 32 self.assertEqual([(b('R'), b('a')), (b('U'), b('b'))],
33 self.client.resolve(listfiles=True)) 33 self.client.resolve(listfiles=True))