annotate tests/test-clone.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 820d7c1e470a
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
93
a4fcece7dd8e hglib: add top level clone method
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
1 import os
148
c1b966866ed7 hglib: make all imports absolute (issue4520)
Brett Cannon <brett@python.org>
parents: 143
diff changeset
2 from tests import common
93
a4fcece7dd8e hglib: add top level clone method
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
3 import hglib
143
4359cabcb0cc hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents: 93
diff changeset
4 from hglib.util import b
93
a4fcece7dd8e hglib: add top level clone method
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
5
a4fcece7dd8e hglib: add top level clone method
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
6 class test_clone(common.basetest):
a4fcece7dd8e hglib: add top level clone method
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
7 def test_basic(self):
a4fcece7dd8e hglib: add top level clone method
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
8 self.append('a', 'a')
143
4359cabcb0cc hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents: 93
diff changeset
9 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: 93
diff changeset
10 cloned = hglib.clone(b('.'), b('cloned'))
93
a4fcece7dd8e hglib: add top level clone method
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
11 self.assertRaises(ValueError, cloned.log)
a4fcece7dd8e hglib: add top level clone method
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
12 cloned.open()
a4fcece7dd8e hglib: add top level clone method
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
13 self.assertEquals(self.client.log(), cloned.log())