Mercurial > public > mercurial-scm > python-hglib
annotate tests/test-bookmarks.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 |
|
143
4359cabcb0cc
hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents:
114
diff
changeset
|
2 from hglib.util import b |
| 24 | 3 |
| 4 class test_bookmarks(common.basetest): | |
| 5 def test_empty(self): | |
| 6 self.assertEquals(self.client.bookmarks(), ([], -1)) | |
| 7 | |
| 8 def test_basic(self): | |
| 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:
114
diff
changeset
|
10 rev0, node0 = self.client.commit(b('first'), addremove=True) |
| 24 | 11 self.append('a', 'a') |
|
143
4359cabcb0cc
hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents:
114
diff
changeset
|
12 rev1, node1 = self.client.commit(b('second')) |
| 24 | 13 |
|
143
4359cabcb0cc
hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents:
114
diff
changeset
|
14 self.client.bookmark(b('zero'), rev0) |
| 24 | 15 self.assertEquals(self.client.bookmarks(), |
|
143
4359cabcb0cc
hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents:
114
diff
changeset
|
16 ([(b('zero'), rev0, node0[:12])], -1)) |
| 24 | 17 |
|
143
4359cabcb0cc
hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents:
114
diff
changeset
|
18 self.client.bookmark(b('one'), rev1) |
|
114
2e2055fc66c3
tests: ignore bookmarks active mark for testing with pre-2.6
Matt Mackall <mpm@selenic.com>
parents:
112
diff
changeset
|
19 self.assertEquals(self.client.bookmarks()[0], |
|
143
4359cabcb0cc
hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents:
114
diff
changeset
|
20 [(b('one'), rev1, node1[:12]), |
|
4359cabcb0cc
hglib: move string literals in the test code to util.b() (issue4520)
Brett Cannon <brett@python.org>
parents:
114
diff
changeset
|
21 (b('zero'), rev0, node0[:12])]) |
| 24 | 22 |
| 23 #def test_spaces(self): | |
| 24 # self.client.bookmark('s pace', self.rev0) | |
| 25 # self.assertEquals(self.client.bookmarks(), | |
| 26 # ([('s pace', 0, self.rev0.node[:12])], -1)) |