Mercurial > public > mercurial-scm > python-hglib
annotate tests/test-phase.py @ 188:5609a21fe39a
client: fail gracefully on unexpected prompts (issue5516)
Right now, if hglib encounters an unexpected prompt, it fails with a rather
opaque "unexpected data on required channel 'L'" error message. Furthermore,
if subsequently another command is called on the same client instance, both
the client and server processes lock up hard (at least on Windows), and the
server process rapidly leaks ~2GB of memory.
Fix this by responding with an empty string to any unexpected prompt. This
will trigger an "abort: response expected" exception from the server, which
is easily handled as a CommandError, and subsequent commands sent from the
same client work as expected.
This doesn't completely resolve bug 5516, as unexpected requests on another
required channel (e.g. I) can still cause a lockup.
However, it does fix the most common case of an unexpected password prompt.
author | G?bor Stefanik <gabor.stefanik@nng.com> |
---|---|
date | Tue, 12 Sep 2017 13:16:36 -0400 |
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 |
c1b966866ed7
hglib: make all imports absolute (issue4520)
Brett Cannon <brett@python.org>
parents:
143
diff
changeset
|
2 import hglib |
143
4359cabcb0cc
hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents:
133
diff
changeset
|
3 from hglib.util import b |
125
8d9a9da3e7b4
client: add 'phase' method to set or get the phase of a changeset
Paul Tonelli <paul.tonelli@logilab.fr>
parents:
diff
changeset
|
4 |
8d9a9da3e7b4
client: add 'phase' method to set or get the phase of a changeset
Paul Tonelli <paul.tonelli@logilab.fr>
parents:
diff
changeset
|
5 class test_phase(common.basetest): |
8d9a9da3e7b4
client: add 'phase' method to set or get the phase of a changeset
Paul Tonelli <paul.tonelli@logilab.fr>
parents:
diff
changeset
|
6 """test the different ways to use the phase command""" |
8d9a9da3e7b4
client: add 'phase' method to set or get the phase of a changeset
Paul Tonelli <paul.tonelli@logilab.fr>
parents:
diff
changeset
|
7 def test_phase(self): |
8d9a9da3e7b4
client: add 'phase' method to set or get the phase of a changeset
Paul Tonelli <paul.tonelli@logilab.fr>
parents:
diff
changeset
|
8 """test getting data from a single changeset""" |
8d9a9da3e7b4
client: add 'phase' method to set or get the phase of a changeset
Paul Tonelli <paul.tonelli@logilab.fr>
parents:
diff
changeset
|
9 self.append('a', 'a') |
143
4359cabcb0cc
hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents:
133
diff
changeset
|
10 rev, node0 = 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:
133
diff
changeset
|
11 self.assertEqual([(0, b('draft'))], self.client.phase(node0)) |
126
a7fe976b1931
context: add 'phase' getter
Paul Tonelli <paul.tonelli@logilab.fr>
parents:
125
diff
changeset
|
12 ctx = self.client[rev] |
143
4359cabcb0cc
hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents:
133
diff
changeset
|
13 self.assertEqual(b('draft'), ctx.phase()) |
125
8d9a9da3e7b4
client: add 'phase' method to set or get the phase of a changeset
Paul Tonelli <paul.tonelli@logilab.fr>
parents:
diff
changeset
|
14 |
8d9a9da3e7b4
client: add 'phase' method to set or get the phase of a changeset
Paul Tonelli <paul.tonelli@logilab.fr>
parents:
diff
changeset
|
15 def test_phase_public(self): |
126
a7fe976b1931
context: add 'phase' getter
Paul Tonelli <paul.tonelli@logilab.fr>
parents:
125
diff
changeset
|
16 """test phase change from draft to public""" |
125
8d9a9da3e7b4
client: add 'phase' method to set or get the phase of a changeset
Paul Tonelli <paul.tonelli@logilab.fr>
parents:
diff
changeset
|
17 self.append('a', 'a') |
143
4359cabcb0cc
hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents:
133
diff
changeset
|
18 rev, node0 = self.client.commit(b('first'), addremove=True) |
125
8d9a9da3e7b4
client: add 'phase' method to set or get the phase of a changeset
Paul Tonelli <paul.tonelli@logilab.fr>
parents:
diff
changeset
|
19 self.client.phase(node0, public=True) |
143
4359cabcb0cc
hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents:
133
diff
changeset
|
20 self.assertEqual([(0, b('public'))], self.client.phase(node0)) |
126
a7fe976b1931
context: add 'phase' getter
Paul Tonelli <paul.tonelli@logilab.fr>
parents:
125
diff
changeset
|
21 ctx = self.client[rev] |
143
4359cabcb0cc
hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents:
133
diff
changeset
|
22 self.assertEqual(b('public'), ctx.phase()) |
125
8d9a9da3e7b4
client: add 'phase' method to set or get the phase of a changeset
Paul Tonelli <paul.tonelli@logilab.fr>
parents:
diff
changeset
|
23 |
8d9a9da3e7b4
client: add 'phase' method to set or get the phase of a changeset
Paul Tonelli <paul.tonelli@logilab.fr>
parents:
diff
changeset
|
24 def test_phase_secret(self): |
126
a7fe976b1931
context: add 'phase' getter
Paul Tonelli <paul.tonelli@logilab.fr>
parents:
125
diff
changeset
|
25 """test phase change from draft to secret""" |
125
8d9a9da3e7b4
client: add 'phase' method to set or get the phase of a changeset
Paul Tonelli <paul.tonelli@logilab.fr>
parents:
diff
changeset
|
26 self.append('a', 'a') |
143
4359cabcb0cc
hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents:
133
diff
changeset
|
27 rev, node0 = self.client.commit(b('first'), addremove=True) |
129
bcc8390d7819
tests: remove "with" usage for 2.4 compatibility
Matt Mackall <mpm@selenic.com>
parents:
126
diff
changeset
|
28 self.assertRaises(hglib.error.CommandError, |
bcc8390d7819
tests: remove "with" usage for 2.4 compatibility
Matt Mackall <mpm@selenic.com>
parents:
126
diff
changeset
|
29 self.client.phase, node0, secret=True) |
125
8d9a9da3e7b4
client: add 'phase' method to set or get the phase of a changeset
Paul Tonelli <paul.tonelli@logilab.fr>
parents:
diff
changeset
|
30 self.client.phase(node0, secret=True, force=True) |
143
4359cabcb0cc
hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents:
133
diff
changeset
|
31 self.assertEqual([(0, b('secret'))], self.client.phase(node0)) |
126
a7fe976b1931
context: add 'phase' getter
Paul Tonelli <paul.tonelli@logilab.fr>
parents:
125
diff
changeset
|
32 ctx = self.client[rev] |
143
4359cabcb0cc
hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents:
133
diff
changeset
|
33 self.assertEqual(b('secret'), ctx.phase()) |
126
a7fe976b1931
context: add 'phase' getter
Paul Tonelli <paul.tonelli@logilab.fr>
parents:
125
diff
changeset
|
34 |
125
8d9a9da3e7b4
client: add 'phase' method to set or get the phase of a changeset
Paul Tonelli <paul.tonelli@logilab.fr>
parents:
diff
changeset
|
35 |
8d9a9da3e7b4
client: add 'phase' method to set or get the phase of a changeset
Paul Tonelli <paul.tonelli@logilab.fr>
parents:
diff
changeset
|
36 def test_phase_multiple(self): |
126
a7fe976b1931
context: add 'phase' getter
Paul Tonelli <paul.tonelli@logilab.fr>
parents:
125
diff
changeset
|
37 """test phase changes and show the phases of the different changesets""" |
125
8d9a9da3e7b4
client: add 'phase' method to set or get the phase of a changeset
Paul Tonelli <paul.tonelli@logilab.fr>
parents:
diff
changeset
|
38 self.append('a', 'a') |
143
4359cabcb0cc
hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents:
133
diff
changeset
|
39 rev, node0 = self.client.commit(b('a'), addremove=True) |
125
8d9a9da3e7b4
client: add 'phase' method to set or get the phase of a changeset
Paul Tonelli <paul.tonelli@logilab.fr>
parents:
diff
changeset
|
40 self.client.phase(node0, public=True) |
8d9a9da3e7b4
client: add 'phase' method to set or get the phase of a changeset
Paul Tonelli <paul.tonelli@logilab.fr>
parents:
diff
changeset
|
41 self.append('b', 'b') |
143
4359cabcb0cc
hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents:
133
diff
changeset
|
42 rev, node1 = self.client.commit(b('b'), addremove=True) |
125
8d9a9da3e7b4
client: add 'phase' method to set or get the phase of a changeset
Paul Tonelli <paul.tonelli@logilab.fr>
parents:
diff
changeset
|
43 self.append('c', 'c') |
143
4359cabcb0cc
hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents:
133
diff
changeset
|
44 rev, node2 = self.client.commit(b('c'), addremove=True) |
125
8d9a9da3e7b4
client: add 'phase' method to set or get the phase of a changeset
Paul Tonelli <paul.tonelli@logilab.fr>
parents:
diff
changeset
|
45 self.client.phase(node2, secret=True, force=True) |
143
4359cabcb0cc
hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents:
133
diff
changeset
|
46 self.assertEqual([(0, b('public')), (2, b('secret')), (1, b('draft'))], |
133 | 47 self.client.phase([node0, node2, node1])) |