Mercurial > public > mercurial-scm > python-hglib
annotate tests/test-remove.py @ 173:8c4d24b58c23 2.1
tests: adjust test-merge for mercurial 3.7
As of changeset 88d5db4b155c, the noninteractive handler for merge
leaves conflicting files unresolved.
author | Julien Cristau <julien.cristau@logilab.fr> |
---|---|
date | Fri, 19 Feb 2016 19:16:30 +0100 |
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 |
143
4359cabcb0cc
hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents:
30
diff
changeset
|
2 from hglib.util import b |
30 | 3 |
4 class test_remove(common.basetest): | |
5 def test_basic(self): | |
6 self.append('a', 'a') | |
143
4359cabcb0cc
hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents:
30
diff
changeset
|
7 self.client.commit(b('first'), addremove=True) |
4359cabcb0cc
hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents:
30
diff
changeset
|
8 self.assertTrue(self.client.remove([b('a')])) |
30 | 9 |
10 def test_warnings(self): | |
11 self.append('a', 'a') | |
143
4359cabcb0cc
hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents:
30
diff
changeset
|
12 self.client.commit(b('first'), addremove=True) |
4359cabcb0cc
hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents:
30
diff
changeset
|
13 self.assertFalse(self.client.remove([b('a'), b('b')])) |