Mercurial > python-hglib

annotate tests/test-import.py @ 118:e738d6fe5f3f 1.1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: make the tests work under Pypy (issue3965) ..which needs explicit close() due to lack of reference counting.
author Matt Mackall <mpm@selenic.com>
date Sun, 23 Jun 2013 17:52:16 -0500
parents 9746227239e0
children 4359cabcb0cc
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):
118
e738d6fe5f3f tests: make the tests work under Pypy (issue3965)
Matt Mackall <mpm@selenic.com>
parents: 96
diff changeset
25 f = open('patch', 'wb')
e738d6fe5f3f tests: make the tests work under Pypy (issue3965)
Matt Mackall <mpm@selenic.com>
parents: 96
diff changeset
26 f.write(patch)
e738d6fe5f3f tests: make the tests work under Pypy (issue3965)
Matt Mackall <mpm@selenic.com>
parents: 96
diff changeset
27 f.close()
96
9746227239e0 client: fix import --no-commit flag (issue3206)
Idan Kamara <idankk86@gmail.com>
parents: 68
diff changeset
28
9746227239e0 client: fix import --no-commit flag (issue3206)
Idan Kamara <idankk86@gmail.com>
parents: 68
diff changeset
29 # --no-commit
9746227239e0 client: fix import --no-commit flag (issue3206)
Idan Kamara <idankk86@gmail.com>
parents: 68
diff changeset
30 self.client.import_(['patch'], nocommit=True)
9746227239e0 client: fix import --no-commit flag (issue3206)
Idan Kamara <idankk86@gmail.com>
parents: 68
diff changeset
31 self.assertEquals(open('a').read(), '1\n')
9746227239e0 client: fix import --no-commit flag (issue3206)
Idan Kamara <idankk86@gmail.com>
parents: 68
diff changeset
32
9746227239e0 client: fix import --no-commit flag (issue3206)
Idan Kamara <idankk86@gmail.com>
parents: 68
diff changeset
33 self.client.update(clean=True)
9746227239e0 client: fix import --no-commit flag (issue3206)
Idan Kamara <idankk86@gmail.com>
parents: 68
diff changeset
34 os.remove('a')
9746227239e0 client: fix import --no-commit flag (issue3206)
Idan Kamara <idankk86@gmail.com>
parents: 68
diff changeset
35
13
400cb1520834 client: add missing options to import_()
Idan Kamara <idankk86@gmail.com>
parents: 7
diff changeset
36 self.client.import_(['patch'])
400cb1520834 client: add missing options to import_()
Idan Kamara <idankk86@gmail.com>
parents: 7
diff changeset
37 self.assertEquals(self.client.cat(['a']), '1\n')