Mercurial > hg
view tests/test-fileset.t @ 18519:ca430fb6a668 stable
tests: fix toctou race in tinyproxy.py (issue3795)
test-http-proxy.t sometimes failed with:
File ".../tests/tinyproxy.py", line 110, in _read_write
data = i.recv(8192)
error: (104, 'Connection reset by peer')
This might have started showing up with a9fd11ffa13f ... but it has apparently
also been seen before. I don't see anything in a9fd11ffa13f that can explain
it. It seems to be a race in test, in the tinyproxy helper:
Tinyproxy found an incoming socket using select(). It would break the loop if
an error had been detected on the socket, but there was no error and it tried
to recv() from the socket. That failed - apparently because it had been reset
after select().
Errors in the recv() will now be caught and will break the loop like errors
detected by select() would.
(send() could also fail in a similar way ... but using the same solution there
and losing data we have read doesn't feel right.)
author | Mads Kiilerich <madski@unity3d.com> |
---|---|
date | Thu, 31 Jan 2013 19:13:13 +0100 |
parents | 1310489eb5d6 |
children | 3ce3f2b059a1 |
line wrap: on
line source
$ fileset() { > hg debugfileset "$@" > } $ hg init repo $ cd repo $ echo a > a1 $ echo a > a2 $ echo b > b1 $ echo b > b2 $ hg ci -Am addfiles adding a1 adding a2 adding b1 adding b2 Test operators and basic patterns $ fileset a1 a1 $ fileset 'a*' a1 a2 $ fileset '"re:a\d"' a1 a2 $ fileset 'a1 or a2' a1 a2 $ fileset 'a1 | a2' a1 a2 $ fileset 'a* and "*1"' a1 $ fileset 'a* & "*1"' a1 $ fileset 'not (r"a*")' b1 b2 $ fileset '! ("a*")' b1 b2 $ fileset 'a* - a1' a2 Test files status $ rm a1 $ hg rm a2 $ echo b >> b2 $ hg cp b1 c1 $ echo c > c2 $ echo c > c3 $ cat > .hgignore <<EOF > \.hgignore > 2$ > EOF $ fileset 'modified()' b2 $ fileset 'added()' c1 $ fileset 'removed()' a2 $ fileset 'deleted()' a1 $ fileset 'unknown()' c3 $ fileset 'ignored()' .hgignore c2 $ fileset 'hgignore()' a2 b2 $ fileset 'clean()' b1 $ fileset 'copied()' c1 Test files properties >>> file('bin', 'wb').write('\0a') $ fileset 'binary()' $ fileset 'binary() and unknown()' bin $ echo '^bin$' >> .hgignore $ fileset 'binary() and ignored()' bin $ hg add bin $ fileset 'binary()' bin $ fileset 'grep("b{1}")' b2 c1 b1 $ fileset 'grep("missingparens(")' hg: parse error: invalid match pattern: unbalanced parenthesis [255] #if execbit $ chmod +x b2 $ fileset 'exec()' b2 #endif #if symlink $ ln -s b2 b2link $ fileset 'symlink() and unknown()' b2link $ hg add b2link #endif >>> file('1k', 'wb').write(' '*1024) >>> file('2k', 'wb').write(' '*2048) $ hg add 1k 2k $ fileset 'size("bar")' hg: parse error: couldn't parse size: bar [255] $ fileset 'size(1k)' 1k $ fileset '(1k or 2k) and size("< 2k")' 1k $ fileset '(1k or 2k) and size("<=2k")' 1k 2k $ fileset '(1k or 2k) and size("> 1k")' 2k $ fileset '(1k or 2k) and size(">=1K")' 1k 2k $ fileset '(1k or 2k) and size(".5KB - 1.5kB")' 1k Test merge states $ hg ci -m manychanges $ hg up -C 0 * files updated, 0 files merged, * files removed, 0 files unresolved (glob) $ echo c >> b2 $ hg ci -m diverging b2 created new head $ fileset 'resolved()' $ fileset 'unresolved()' $ hg merge merging b2 warning: conflicts during merge. merging b2 incomplete! (edit conflicts, then use 'hg resolve --mark') * files updated, 0 files merged, * files removed, 1 files unresolved (glob) use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon [1] $ fileset 'resolved()' $ fileset 'unresolved()' b2 $ echo e > b2 $ hg resolve -m b2 $ fileset 'resolved()' b2 $ fileset 'unresolved()' $ hg ci -m merge Test subrepo predicate $ hg init sub $ echo a > sub/suba $ hg -R sub add sub/suba $ hg -R sub ci -m sub $ echo 'sub = sub' > .hgsub $ fileset 'subrepo()' $ hg add .hgsub $ fileset 'subrepo()' sub $ fileset 'subrepo("sub")' sub $ fileset 'subrepo("glob:*")' sub $ hg ci -m subrepo Test with a revision $ hg log -G --template '{rev} {desc}\n' @ 4 subrepo | o 3 merge |\ | o 2 diverging | | o | 1 manychanges |/ o 0 addfiles $ echo unknown > unknown $ fileset -r1 'modified()' b2 $ fileset -r1 'added() and c1' c1 $ fileset -r1 'removed()' a2 $ fileset -r1 'deleted()' $ fileset -r1 'unknown()' $ fileset -r1 'ignored()' $ fileset -r1 'hgignore()' b2 bin $ fileset -r1 'binary()' bin $ fileset -r1 'size(1k)' 1k $ fileset -r3 'resolved()' $ fileset -r3 'unresolved()' #if execbit $ fileset -r1 'exec()' b2 #endif #if symlink $ fileset -r1 'symlink()' b2link #endif $ fileset -r4 'subrepo("re:su.*")' sub $ fileset -r4 'subrepo("sub")' sub $ fileset -r4 'b2 or c1' b2 c1