Mercurial > python-hglib
comparison tests/test_pull.py @ 219:8341f2494b3f
hglib tests: migrate away from (unmaintained) nose
author | Mathias De Mare <mathias.de_mare@nokia.com> |
---|---|
date | Wed, 08 Mar 2023 17:04:58 +0100 |
parents | tests/test-pull.py@c1b966866ed7 |
children | a2afbf236ca8 |
comparison
equal
deleted
inserted
replaced
218:934608d4fcba | 219:8341f2494b3f |
---|---|
1 from tests import common | |
2 import hglib | |
3 from hglib.util import b | |
4 | |
5 class test_pull(common.basetest): | |
6 def test_basic(self): | |
7 self.append('a', 'a') | |
8 self.client.commit(b('first'), addremove=True) | |
9 | |
10 self.client.clone(dest=b('other')) | |
11 other = hglib.open(b('other')) | |
12 | |
13 self.append('a', 'a') | |
14 self.client.commit(b('second')) | |
15 | |
16 self.assertTrue(other.pull()) | |
17 self.assertEquals(self.client.log(), other.log()) | |
18 | |
19 def test_unresolved(self): | |
20 self.append('a', 'a') | |
21 self.client.commit(b('first'), addremove=True) | |
22 | |
23 self.client.clone(dest=b('other')) | |
24 other = hglib.open(b('other')) | |
25 | |
26 self.append('a', 'a') | |
27 self.client.commit(b('second')) | |
28 | |
29 self.append('other/a', 'b') | |
30 self.assertFalse(other.pull(update=True)) | |
31 self.assertTrue((b('M'), b('a')) in other.status()) |