annotate tests/test-summary.py @ 213:388820908580 2.6.2

hglib: update grep to cope with behavior change in hg 5.2. Since version 5.2, revision filed not printed without all argument. Fixed inaccurate pasring result with lastest hg and changed test case.
author Daehyeok Mun <daehyeok@gmail.com>
date Sat, 21 Mar 2020 19:59:50 -0700
parents 9062a6b935ad
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
187
9062a6b935ad summary: parse commit line less strictly (issue5637)
Yuya Nishihara <yuya@tcha.org>
parents: 165
diff changeset
1 import unittest
148
c1b966866ed7 hglib: make all imports absolute (issue4520)
Brett Cannon <brett@python.org>
parents: 143
diff changeset
2 from tests import common
51
c52383a550fb client: add summary command
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: 88
diff changeset
4 from hglib.util import b
51
c52383a550fb client: add summary command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
5
c52383a550fb client: add summary command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
6 class test_summary(common.basetest):
c52383a550fb client: add summary command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
7 def test_empty(self):
143
4359cabcb0cc hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents: 88
diff changeset
8 d = {b('parent') : [(-1, b('000000000000'), b('tip'), None)],
4359cabcb0cc hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents: 88
diff changeset
9 b('branch') : b('default'),
4359cabcb0cc hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents: 88
diff changeset
10 b('commit') : True,
4359cabcb0cc hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents: 88
diff changeset
11 b('update') : 0}
51
c52383a550fb client: add summary command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
12
c52383a550fb client: add summary command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
13 self.assertEquals(self.client.summary(), d)
c52383a550fb client: add summary command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
14
c52383a550fb client: add summary command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
15 def test_basic(self):
c52383a550fb client: add summary command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
16 self.append('a', 'a')
143
4359cabcb0cc hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents: 88
diff changeset
17 rev, node = self.client.commit(b('first'), addremove=True)
51
c52383a550fb client: add summary command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
18
143
4359cabcb0cc hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents: 88
diff changeset
19 d = {b('parent') : [(0, node[:12], b('tip'), b('first'))],
4359cabcb0cc hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents: 88
diff changeset
20 b('branch') : b('default'),
4359cabcb0cc hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents: 88
diff changeset
21 b('commit') : True,
4359cabcb0cc hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents: 88
diff changeset
22 b('update') : 0}
164
568bca4ff58e tests: update test-summary for mercurial 3.5
Julien Cristau <julien.cristau@logilab.fr>
parents: 148
diff changeset
23 if self.client.version >= (3, 5):
165
dbb21a4c0eb9 tests: fix test-summary for python3
Julien Cristau <julien.cristau@logilab.fr>
parents: 164
diff changeset
24 d[b('phases')] = b('1 draft')
51
c52383a550fb client: add summary command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
25
c52383a550fb client: add summary command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
26 self.assertEquals(self.client.summary(), d)
c52383a550fb client: add summary command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
27
c52383a550fb client: add summary command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
28 def test_commit_dirty(self):
c52383a550fb client: add summary command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
29 self.append('a', 'a')
143
4359cabcb0cc hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents: 88
diff changeset
30 rev, node = self.client.commit(b('first'), addremove=True)
51
c52383a550fb client: add summary command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
31 self.append('a', 'a')
c52383a550fb client: add summary command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
32
143
4359cabcb0cc hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents: 88
diff changeset
33 d = {b('parent') : [(0, node[:12], b('tip'), b('first'))],
4359cabcb0cc hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents: 88
diff changeset
34 b('branch') : b('default'),
4359cabcb0cc hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents: 88
diff changeset
35 b('commit') : False,
4359cabcb0cc hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents: 88
diff changeset
36 b('update') : 0}
164
568bca4ff58e tests: update test-summary for mercurial 3.5
Julien Cristau <julien.cristau@logilab.fr>
parents: 148
diff changeset
37 if self.client.version >= (3, 5):
165
dbb21a4c0eb9 tests: fix test-summary for python3
Julien Cristau <julien.cristau@logilab.fr>
parents: 164
diff changeset
38 d[b('phases')] = b('1 draft')
51
c52383a550fb client: add summary command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
39
c52383a550fb client: add summary command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
40 self.assertEquals(self.client.summary(), d)
c52383a550fb client: add summary command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
41
187
9062a6b935ad summary: parse commit line less strictly (issue5637)
Yuya Nishihara <yuya@tcha.org>
parents: 165
diff changeset
42 def test_secret_commit_clean(self):
9062a6b935ad summary: parse commit line less strictly (issue5637)
Yuya Nishihara <yuya@tcha.org>
parents: 165
diff changeset
43 if self.client.version < (2, 1):
9062a6b935ad summary: parse commit line less strictly (issue5637)
Yuya Nishihara <yuya@tcha.org>
parents: 165
diff changeset
44 raise unittest.SkipTest('phase not supported')
9062a6b935ad summary: parse commit line less strictly (issue5637)
Yuya Nishihara <yuya@tcha.org>
parents: 165
diff changeset
45 self.append('a', 'a')
9062a6b935ad summary: parse commit line less strictly (issue5637)
Yuya Nishihara <yuya@tcha.org>
parents: 165
diff changeset
46 rev, node = self.client.commit(b('first'), addremove=True)
9062a6b935ad summary: parse commit line less strictly (issue5637)
Yuya Nishihara <yuya@tcha.org>
parents: 165
diff changeset
47 self.client.phase([b('%d') % rev], secret=True, force=True)
9062a6b935ad summary: parse commit line less strictly (issue5637)
Yuya Nishihara <yuya@tcha.org>
parents: 165
diff changeset
48 e = self.client.summary()
9062a6b935ad summary: parse commit line less strictly (issue5637)
Yuya Nishihara <yuya@tcha.org>
parents: 165
diff changeset
49 self.assertTrue(e[b('commit')])
9062a6b935ad summary: parse commit line less strictly (issue5637)
Yuya Nishihara <yuya@tcha.org>
parents: 165
diff changeset
50
51
c52383a550fb client: add summary command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
51 def test_update(self):
c52383a550fb client: add summary command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
52 self.append('a', 'a')
143
4359cabcb0cc hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents: 88
diff changeset
53 rev, node = self.client.commit(b('first'), addremove=True)
51
c52383a550fb client: add summary command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
54 self.append('a', 'a')
143
4359cabcb0cc hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents: 88
diff changeset
55 self.client.commit(b('second'))
51
c52383a550fb client: add summary command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
56 self.client.update(0)
c52383a550fb client: add summary command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
57
143
4359cabcb0cc hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents: 88
diff changeset
58 d = {b('parent') : [(0, node[:12], None, b('first'))],
4359cabcb0cc hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents: 88
diff changeset
59 b('branch') : b('default'),
4359cabcb0cc hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents: 88
diff changeset
60 b('commit') : True,
4359cabcb0cc hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents: 88
diff changeset
61 b('update') : 1}
164
568bca4ff58e tests: update test-summary for mercurial 3.5
Julien Cristau <julien.cristau@logilab.fr>
parents: 148
diff changeset
62 if self.client.version >= (3, 5):
165
dbb21a4c0eb9 tests: fix test-summary for python3
Julien Cristau <julien.cristau@logilab.fr>
parents: 164
diff changeset
63 d[b('phases')] = b('2 draft')
51
c52383a550fb client: add summary command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
64
c52383a550fb client: add summary command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
65 self.assertEquals(self.client.summary(), d)
c52383a550fb client: add summary command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
66
c52383a550fb client: add summary command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
67 def test_remote(self):
c52383a550fb client: add summary command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
68 self.append('a', 'a')
143
4359cabcb0cc hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents: 88
diff changeset
69 rev, node = self.client.commit(b('first'), addremove=True)
51
c52383a550fb client: add summary command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
70
143
4359cabcb0cc hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents: 88
diff changeset
71 self.client.clone(dest=b('other'))
51
c52383a550fb client: add summary command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
72 other = hglib.open('other')
c52383a550fb client: add summary command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
73
143
4359cabcb0cc hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents: 88
diff changeset
74 d = {b('parent') : [(0, node[:12], b('tip'), b('first'))],
4359cabcb0cc hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents: 88
diff changeset
75 b('branch') : b('default'),
4359cabcb0cc hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents: 88
diff changeset
76 b('commit') : True,
4359cabcb0cc hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents: 88
diff changeset
77 b('update') : 0,
4359cabcb0cc hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents: 88
diff changeset
78 b('remote') : (0, 0, 0, 0)}
51
c52383a550fb client: add summary command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
79
c52383a550fb client: add summary command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
80 self.assertEquals(other.summary(remote=True), d)
c52383a550fb client: add summary command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
81
c52383a550fb client: add summary command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
82 self.append('a', 'a')
143
4359cabcb0cc hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents: 88
diff changeset
83 self.client.commit(b('second'))
51
c52383a550fb client: add summary command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
84
143
4359cabcb0cc hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents: 88
diff changeset
85 d[b('remote')] = (1, 0, 0, 0)
51
c52383a550fb client: add summary command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
86 self.assertEquals(other.summary(remote=True), d)
c52383a550fb client: add summary command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
87
143
4359cabcb0cc hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents: 88
diff changeset
88 self.client.bookmark(b('bm'))
4359cabcb0cc hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents: 88
diff changeset
89 d[b('remote')] = (1, 1, 0, 0)
51
c52383a550fb client: add summary command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
90 self.assertEquals(other.summary(remote=True), d)
c52383a550fb client: add summary command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
91
143
4359cabcb0cc hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents: 88
diff changeset
92 other.bookmark(b('bmother'))
4359cabcb0cc hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents: 88
diff changeset
93 d[b('remote')] = (1, 1, 0, 1)
88
3bbf6a3266f4 test-summary: fix test due to bookmarks being separated from tags in hg >= 2.0
Idan Kamara <idankk86@gmail.com>
parents: 51
diff changeset
94 if self.client.version < (2, 0, 0):
143
4359cabcb0cc hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents: 88
diff changeset
95 d[b('parent')] = [(0, node[:12], b('tip bmother'), b('first'))]
88
3bbf6a3266f4 test-summary: fix test due to bookmarks being separated from tags in hg >= 2.0
Idan Kamara <idankk86@gmail.com>
parents: 51
diff changeset
96 else:
143
4359cabcb0cc hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents: 88
diff changeset
97 d[b('bookmarks')] = b('*bmother')
51
c52383a550fb client: add summary command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
98 self.assertEquals(other.summary(remote=True), d)
c52383a550fb client: add summary command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
99
c52383a550fb client: add summary command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
100 self.append('other/a', 'a')
143
4359cabcb0cc hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents: 88
diff changeset
101 rev, node = other.commit(b('second in other'))
51
c52383a550fb client: add summary command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
102
143
4359cabcb0cc hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents: 88
diff changeset
103 d[b('remote')] = (1, 1, 1, 1)
88
3bbf6a3266f4 test-summary: fix test due to bookmarks being separated from tags in hg >= 2.0
Idan Kamara <idankk86@gmail.com>
parents: 51
diff changeset
104 if self.client.version < (2, 0, 0):
143
4359cabcb0cc hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents: 88
diff changeset
105 tags = b('tip bmother')
88
3bbf6a3266f4 test-summary: fix test due to bookmarks being separated from tags in hg >= 2.0
Idan Kamara <idankk86@gmail.com>
parents: 51
diff changeset
106 else:
143
4359cabcb0cc hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents: 88
diff changeset
107 tags = b('tip')
4359cabcb0cc hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents: 88
diff changeset
108 d[b('parent')] = [(1, node[:12], tags, b('second in other'))]
164
568bca4ff58e tests: update test-summary for mercurial 3.5
Julien Cristau <julien.cristau@logilab.fr>
parents: 148
diff changeset
109 if self.client.version >= (3, 5):
165
dbb21a4c0eb9 tests: fix test-summary for python3
Julien Cristau <julien.cristau@logilab.fr>
parents: 164
diff changeset
110 d[b('phases')] = b('1 draft')
51
c52383a550fb client: add summary command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
111
c52383a550fb client: add summary command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
112 self.assertEquals(other.summary(remote=True), d)
c52383a550fb client: add summary command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
113
c52383a550fb client: add summary command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
114 def test_two_parents(self):
c52383a550fb client: add summary command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
115 self.append('a', 'a')
143
4359cabcb0cc hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents: 88
diff changeset
116 rev0, node = self.client.commit(b('first'), addremove=True)
51
c52383a550fb client: add summary command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
117
c52383a550fb client: add summary command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
118 self.append('a', 'a')
143
4359cabcb0cc hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents: 88
diff changeset
119 rev1, node1 = self.client.commit(b('second'))
51
c52383a550fb client: add summary command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
120
c52383a550fb client: add summary command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
121 self.client.update(rev0)
c52383a550fb client: add summary command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
122 self.append('b', 'a')
143
4359cabcb0cc hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents: 88
diff changeset
123 rev2, node2 = self.client.commit(b('third'), addremove=True)
51
c52383a550fb client: add summary command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
124
c52383a550fb client: add summary command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
125 self.client.merge(rev1)
c52383a550fb client: add summary command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
126
143
4359cabcb0cc hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents: 88
diff changeset
127 d = {b('parent') : [(2, node2[:12], b('tip'), b('third')),
4359cabcb0cc hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents: 88
diff changeset
128 (1, node1[:12], None, b('second'))],
4359cabcb0cc hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents: 88
diff changeset
129 b('branch') : b('default'),
4359cabcb0cc hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents: 88
diff changeset
130 b('commit') : False,
4359cabcb0cc hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents: 88
diff changeset
131 b('update') : 0}
164
568bca4ff58e tests: update test-summary for mercurial 3.5
Julien Cristau <julien.cristau@logilab.fr>
parents: 148
diff changeset
132 if self.client.version >= (3, 5):
165
dbb21a4c0eb9 tests: fix test-summary for python3
Julien Cristau <julien.cristau@logilab.fr>
parents: 164
diff changeset
133 d[b('phases')] = b('3 draft')
51
c52383a550fb client: add summary command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
134
c52383a550fb client: add summary command
Idan Kamara <idankk86@gmail.com>
parents:
diff changeset
135 self.assertEquals(self.client.summary(), d)