Mercurial > hg
view tests/bundles/rebase.sh @ 34447:5385b76fd1fd
zeroconf: do not crash if socket being read is closed by another thread
In zeroconf/__init__.py, there is:
server = Zeroconf.Zeroconf(ip)
l = listener()
Zeroconf.ServiceBrowser(server, "_hg._tcp.local.", l)
time.sleep(1)
server.close()
`server.close()` closes the underlying socket while the `ServiceBrowser` may
still have a background thread reading the socket. There could be a race
condition where the reading thread reads the closed socket, resulting in
EBADF crash. This patch catches the exception.
This makes test-paths.t pass with chg.
Differential Revision: https://phab.mercurial-scm.org/D919
author | Jun Wu <quark@fb.com> |
---|---|
date | Mon, 02 Oct 2017 20:23:25 -0700 |
parents | 5d57b2101ab1 |
children |
line wrap: on
line source
#!/usr/bin/env bash hg init rebase cd rebase # @ 7: 'H' # | # | o 6: 'G' # |/| # o | 5: 'F' # | | # | o 4: 'E' # |/ # | o 3: 'D' # | | # | o 2: 'C' # | | # | o 1: 'B' # |/ # o 0: 'A' echo A > A hg ci -Am A echo B > B hg ci -Am B echo C > C hg ci -Am C echo D > D hg ci -Am D hg up -q -C 0 echo E > E hg ci -Am E hg up -q -C 0 echo F > F hg ci -Am F hg merge -r 4 hg ci -m G hg up -q -C 5 echo H > H hg ci -Am H hg bundle -a ../rebase.hg cd .. rm -Rf rebase