annotate tests/test-debian-packages.t @ 37631:2f626233859b

wireproto: implement batching on peer executor interface This is a bit more complicated than non-batch requests because we need to buffer sends until the last request arrives *and* we need to support resolving futures as data arrives from the remote. In a classical concurrent.futures executor model, the future "starts" as soon as it is submitted. However, we have nothing to start until the last command is submitted. If we did nothing, calling result() would deadlock, since the future hasn't "started." So in the case where we queue the command, we return a special future type whose result() will trigger sendcommands(). This eliminates the deadlock potential. It also serves as a check against callers who may be calling result() prematurely, as it will prevent any subsequent callcommands() from working. This behavior is slightly annoying and a bit restrictive. But it's the world that half duplex connections forces on us. In order to support streaming responses, we were previously using a generator. But with a futures-based API, we're using futures and not generators. So in order to get streaming, we need a background thread to read data from the server. The approach taken in this patch is to leverage the ThreadPoolExecutor from concurrent.futures for managing a background thread. We create an executor and future that resolves when all response data is processed (or an error occurs). When exiting the context manager, we wait on that background reading before returning. I was hoping we could manually spin up a threading.Thread and this would be simple. But I ran into a few deadlocks when implementing. After looking at the source code to concurrent.futures, I figured it would just be easier to use a ThreadPoolExecutor than implement all the code needed to manually manage a thread. To prove this works, a use of the batch API in discovery has been updated. Differential Revision: https://phab.mercurial-scm.org/D3269
author Gregory Szorc <gregory.szorc@gmail.com>
date Fri, 13 Apr 2018 11:02:34 -0700
parents 0133ca39c688
children 7574ccd87200
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
34401
13d3f8aaed87 tests: add "have" check for dpkg builddeps
Kyle Lippincott <spectral@google.com>
parents: 34400
diff changeset
1 #require test-repo slow debhelper debdeps
26148
7f49efcaa9b4 debian: switch to using debhelper and dh_python2 to build debs
Augie Fackler <augie@google.com>
parents: 26147
diff changeset
2
29219
3c9066ed557c tests: silence test-repo obsolete warning
timeless <timeless@mozdev.org>
parents: 26148
diff changeset
3 $ . "$TESTDIR/helpers-testrepo.sh"
33204
ddd65b4f3ae6 tests: alias syshg and syshgenv so they can be switched conditionally
Yuya Nishihara <yuya@tcha.org>
parents: 33116
diff changeset
4 $ testrepohgenv
29219
3c9066ed557c tests: silence test-repo obsolete warning
timeless <timeless@mozdev.org>
parents: 26148
diff changeset
5
26148
7f49efcaa9b4 debian: switch to using debhelper and dh_python2 to build debs
Augie Fackler <augie@google.com>
parents: 26147
diff changeset
6 Ensure debuild doesn't run the testsuite, as that could get silly.
7f49efcaa9b4 debian: switch to using debhelper and dh_python2 to build debs
Augie Fackler <augie@google.com>
parents: 26147
diff changeset
7 $ DEB_BUILD_OPTIONS=nocheck
7f49efcaa9b4 debian: switch to using debhelper and dh_python2 to build debs
Augie Fackler <augie@google.com>
parents: 26147
diff changeset
8 $ export DEB_BUILD_OPTIONS
26147
a02c22e48142 test-debian-packages: new test for testing construction of debian packages
Augie Fackler <augie@google.com>
parents:
diff changeset
9 $ OUTPUTDIR=`pwd`
a02c22e48142 test-debian-packages: new test for testing construction of debian packages
Augie Fackler <augie@google.com>
parents:
diff changeset
10 $ export OUTPUTDIR
a02c22e48142 test-debian-packages: new test for testing construction of debian packages
Augie Fackler <augie@google.com>
parents:
diff changeset
11
a02c22e48142 test-debian-packages: new test for testing construction of debian packages
Augie Fackler <augie@google.com>
parents:
diff changeset
12 $ cd "$TESTDIR"/..
a02c22e48142 test-debian-packages: new test for testing construction of debian packages
Augie Fackler <augie@google.com>
parents:
diff changeset
13 $ make deb > $OUTPUTDIR/build.log 2>&1
a02c22e48142 test-debian-packages: new test for testing construction of debian packages
Augie Fackler <augie@google.com>
parents:
diff changeset
14 $ cd $OUTPUTDIR
34400
3d936da4f97b tests: expect parsers.so in cext, parsers.py in pure (test-debian-packages)
Kyle Lippincott <spectral@google.com>
parents: 33204
diff changeset
15 $ ls *.deb | grep -v 'dbg'
26148
7f49efcaa9b4 debian: switch to using debhelper and dh_python2 to build debs
Augie Fackler <augie@google.com>
parents: 26147
diff changeset
16 mercurial-common_*.deb (glob)
7f49efcaa9b4 debian: switch to using debhelper and dh_python2 to build debs
Augie Fackler <augie@google.com>
parents: 26147
diff changeset
17 mercurial_*.deb (glob)
7f49efcaa9b4 debian: switch to using debhelper and dh_python2 to build debs
Augie Fackler <augie@google.com>
parents: 26147
diff changeset
18 main deb should have .so but no .py
7f49efcaa9b4 debian: switch to using debhelper and dh_python2 to build debs
Augie Fackler <augie@google.com>
parents: 26147
diff changeset
19 $ dpkg --contents mercurial_*.deb | egrep '(localrepo|parsers)'
34400
3d936da4f97b tests: expect parsers.so in cext, parsers.py in pure (test-debian-packages)
Kyle Lippincott <spectral@google.com>
parents: 33204
diff changeset
20 * ./usr/lib/python2.7/dist-packages/mercurial/cext/parsers*.so (glob)
26148
7f49efcaa9b4 debian: switch to using debhelper and dh_python2 to build debs
Augie Fackler <augie@google.com>
parents: 26147
diff changeset
21 mercurial-common should have py but no .so or pyc
34400
3d936da4f97b tests: expect parsers.so in cext, parsers.py in pure (test-debian-packages)
Kyle Lippincott <spectral@google.com>
parents: 33204
diff changeset
22 $ dpkg --contents mercurial-common_*.deb | egrep '(localrepo|parsers.*so)'
26148
7f49efcaa9b4 debian: switch to using debhelper and dh_python2 to build debs
Augie Fackler <augie@google.com>
parents: 26147
diff changeset
23 * ./usr/lib/python2.7/dist-packages/mercurial/localrepo.py (glob)
34405
9ecc622ca23f deb: install zsh completions to /usr/share/zsh/vendor-completions
Kyle Lippincott <spectral@google.com>
parents: 34401
diff changeset
24 zsh completions should be in the common package
9ecc622ca23f deb: install zsh completions to /usr/share/zsh/vendor-completions
Kyle Lippincott <spectral@google.com>
parents: 34401
diff changeset
25 $ dpkg --contents mercurial-common_*.deb | egrep 'zsh.*[^/]$'
9ecc622ca23f deb: install zsh completions to /usr/share/zsh/vendor-completions
Kyle Lippincott <spectral@google.com>
parents: 34401
diff changeset
26 * ./usr/share/zsh/vendor-completions/_hg (glob)
34406
0133ca39c688 deb: build and install chg
Kyle Lippincott <spectral@google.com>
parents: 34405
diff changeset
27 chg should be installed alongside hg, in the 'mercurial' package
0133ca39c688 deb: build and install chg
Kyle Lippincott <spectral@google.com>
parents: 34405
diff changeset
28 $ dpkg --contents mercurial_*.deb | egrep 'chg$'
0133ca39c688 deb: build and install chg
Kyle Lippincott <spectral@google.com>
parents: 34405
diff changeset
29 * ./usr/bin/chg (glob)
0133ca39c688 deb: build and install chg
Kyle Lippincott <spectral@google.com>
parents: 34405
diff changeset
30 chg should come with a man page
0133ca39c688 deb: build and install chg
Kyle Lippincott <spectral@google.com>
parents: 34405
diff changeset
31 $ dpkg --contents mercurial_*.deb | egrep 'man.*chg'
0133ca39c688 deb: build and install chg
Kyle Lippincott <spectral@google.com>
parents: 34405
diff changeset
32 * ./usr/share/man/man1/chg.1.gz (glob)