annotate tests/test_pull.py @ 221:a2afbf236ca8

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
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
148
c1b966866ed7 hglib: make all imports absolute (issue4520)
Brett Cannon <brett@python.org>
parents: 143
diff changeset
1 from tests import common
c1b966866ed7 hglib: make all imports absolute (issue4520)
Brett Cannon <brett@python.org>
parents: 143
diff changeset
2 import hglib
143
4359cabcb0cc hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents: 40
diff changeset
3 from hglib.util import b
40
238efe4fd7db client: add pull command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
4
238efe4fd7db client: add pull command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
5 class test_pull(common.basetest):
238efe4fd7db client: add pull command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
6 def test_basic(self):
238efe4fd7db client: add pull command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
7 self.append('a', 'a')
143
4359cabcb0cc hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents: 40
diff changeset
8 self.client.commit(b('first'), addremove=True)
40
238efe4fd7db client: add pull command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
9
143
4359cabcb0cc hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents: 40
diff changeset
10 self.client.clone(dest=b('other'))
4359cabcb0cc hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents: 40
diff changeset
11 other = hglib.open(b('other'))
40
238efe4fd7db client: add pull command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
12
238efe4fd7db client: add pull command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
13 self.append('a', 'a')
143
4359cabcb0cc hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents: 40
diff changeset
14 self.client.commit(b('second'))
40
238efe4fd7db client: add pull command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
15
238efe4fd7db client: add pull command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
16 self.assertTrue(other.pull())
221
a2afbf236ca8 hglib tests: remove deprecated constructions
Mathias De Mare <mathias.de_mare@nokia.com>
parents: 219
diff changeset
17 self.assertEqual(self.client.log(), other.log())
40
238efe4fd7db client: add pull command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
18
238efe4fd7db client: add pull command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
19 def test_unresolved(self):
238efe4fd7db client: add pull command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
20 self.append('a', 'a')
143
4359cabcb0cc hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents: 40
diff changeset
21 self.client.commit(b('first'), addremove=True)
40
238efe4fd7db client: add pull command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
22
143
4359cabcb0cc hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents: 40
diff changeset
23 self.client.clone(dest=b('other'))
4359cabcb0cc hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents: 40
diff changeset
24 other = hglib.open(b('other'))
40
238efe4fd7db client: add pull command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
25
238efe4fd7db client: add pull command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
26 self.append('a', 'a')
143
4359cabcb0cc hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents: 40
diff changeset
27 self.client.commit(b('second'))
40
238efe4fd7db client: add pull command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
28
238efe4fd7db client: add pull command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
29 self.append('other/a', 'b')
238efe4fd7db client: add pull command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
30 self.assertFalse(other.pull(update=True))
143
4359cabcb0cc hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents: 40
diff changeset
31 self.assertTrue((b('M'), b('a')) in other.status())