Mercurial > python-hglib
annotate tests/test-pull.py @ 194:22767a1e61ac
client: make it robust for weird repository path
author | Yuya Nishihara <yuya@tcha.org> |
---|---|
date | Sat, 11 Nov 2017 20:35:55 +0900 |
parents | c1b966866ed7 |
children |
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 | 4 |
5 class test_pull(common.basetest): | |
6 def test_basic(self): | |
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 | 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 | 12 |
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 | 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') | |
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 | 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 | 25 |
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 | 28 |
29 self.append('other/a', 'b') | |
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()) |