annotate tests/test-import.py @ 96:9746227239e0

client: fix import --no-commit flag (issue3206)
author Idan Kamara <idankk86@gmail.com>
date Mon, 16 Jan 2012 12:52:30 +0200
parents a0328b08e028
children e738d6fe5f3f
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
96
9746227239e0 client: fix import --no-commit flag (issue3206)
Idan Kamara <idankk86@gmail.com>
parents: 68
diff changeset
1 import common, cStringIO, os
7
eac8be119d81 tests: rearrange tests and use nosetests
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
2 import hglib
eac8be119d81 tests: rearrange tests and use nosetests
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
3
13
400cb1520834 client: add missing options to import_()
Idan Kamara <idankk86@gmail.com>
parents: 7
diff changeset
4 patch = """
7
eac8be119d81 tests: rearrange tests and use nosetests
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
5 # HG changeset patch
eac8be119d81 tests: rearrange tests and use nosetests
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
6 # User test
eac8be119d81 tests: rearrange tests and use nosetests
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
7 # Date 0 0
eac8be119d81 tests: rearrange tests and use nosetests
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
8 # Node ID c103a3dec114d882c98382d684d8af798d09d857
eac8be119d81 tests: rearrange tests and use nosetests
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
9 # Parent 0000000000000000000000000000000000000000
eac8be119d81 tests: rearrange tests and use nosetests
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
10 1
eac8be119d81 tests: rearrange tests and use nosetests
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
11
eac8be119d81 tests: rearrange tests and use nosetests
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
12 diff -r 000000000000 -r c103a3dec114 a
eac8be119d81 tests: rearrange tests and use nosetests
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
13 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
eac8be119d81 tests: rearrange tests and use nosetests
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
14 +++ b/a Thu Jan 01 00:00:00 1970 +0000
eac8be119d81 tests: rearrange tests and use nosetests
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
15 @@ -0,0 +1,1 @@
eac8be119d81 tests: rearrange tests and use nosetests
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
16 +1
eac8be119d81 tests: rearrange tests and use nosetests
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
17 """
13
400cb1520834 client: add missing options to import_()
Idan Kamara <idankk86@gmail.com>
parents: 7
diff changeset
18
400cb1520834 client: add missing options to import_()
Idan Kamara <idankk86@gmail.com>
parents: 7
diff changeset
19 class test_import(common.basetest):
400cb1520834 client: add missing options to import_()
Idan Kamara <idankk86@gmail.com>
parents: 7
diff changeset
20 def test_basic_cstringio(self):
7
eac8be119d81 tests: rearrange tests and use nosetests
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
21 self.client.import_(cStringIO.StringIO(patch))
eac8be119d81 tests: rearrange tests and use nosetests
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
22 self.assertEquals(self.client.cat(['a']), '1\n')
13
400cb1520834 client: add missing options to import_()
Idan Kamara <idankk86@gmail.com>
parents: 7
diff changeset
23
400cb1520834 client: add missing options to import_()
Idan Kamara <idankk86@gmail.com>
parents: 7
diff changeset
24 def test_basic_file(self):
68
a0328b08e028 tests: open files in binary mode so new lines aren't converted
Idan Kamara <idankk86@gmail.com>
parents: 13
diff changeset
25 open('patch', 'wb').write(patch)
96
9746227239e0 client: fix import --no-commit flag (issue3206)
Idan Kamara <idankk86@gmail.com>
parents: 68
diff changeset
26
9746227239e0 client: fix import --no-commit flag (issue3206)
Idan Kamara <idankk86@gmail.com>
parents: 68
diff changeset
27 # --no-commit
9746227239e0 client: fix import --no-commit flag (issue3206)
Idan Kamara <idankk86@gmail.com>
parents: 68
diff changeset
28 self.client.import_(['patch'], nocommit=True)
9746227239e0 client: fix import --no-commit flag (issue3206)
Idan Kamara <idankk86@gmail.com>
parents: 68
diff changeset
29 self.assertEquals(open('a').read(), '1\n')
9746227239e0 client: fix import --no-commit flag (issue3206)
Idan Kamara <idankk86@gmail.com>
parents: 68
diff changeset
30
9746227239e0 client: fix import --no-commit flag (issue3206)
Idan Kamara <idankk86@gmail.com>
parents: 68
diff changeset
31 self.client.update(clean=True)
9746227239e0 client: fix import --no-commit flag (issue3206)
Idan Kamara <idankk86@gmail.com>
parents: 68
diff changeset
32 os.remove('a')
9746227239e0 client: fix import --no-commit flag (issue3206)
Idan Kamara <idankk86@gmail.com>
parents: 68
diff changeset
33
13
400cb1520834 client: add missing options to import_()
Idan Kamara <idankk86@gmail.com>
parents: 7
diff changeset
34 self.client.import_(['patch'])
400cb1520834 client: add missing options to import_()
Idan Kamara <idankk86@gmail.com>
parents: 7
diff changeset
35 self.assertEquals(self.client.cat(['a']), '1\n')