##// END OF EJS Templates
run-tests: allow some slack about 'waiting on lock' message...
marmoute -
r46636:f44b9c72 default
parent child Browse files
Show More
@@ -1448,6 +1448,7 b' class Test(unittest.TestCase):'
1448 1448 hgrc.write(b'merge = internal:merge\n')
1449 1449 hgrc.write(b'mergemarkers = detailed\n')
1450 1450 hgrc.write(b'promptecho = True\n')
1451 hgrc.write(b'timeout.warn=15\n')
1451 1452 hgrc.write(b'[defaults]\n')
1452 1453 hgrc.write(b'[devel]\n')
1453 1454 hgrc.write(b'all-warnings = true\n')
@@ -13,6 +13,7 b' Create a repository:'
13 13 ui.merge=internal:merge
14 14 ui.mergemarkers=detailed
15 15 ui.promptecho=True
16 ui.timeout.warn=15
16 17 web.address=localhost
17 18 web\.ipv6=(?:True|False) (re)
18 19 web.server-header=testing stub value
@@ -214,6 +214,7 b' check that local configs for the cached '
214 214 ui.detailed-exit-code=True
215 215 ui.merge=internal:merge
216 216 ui.mergemarkers=detailed
217 ui.timeout.warn=15
217 218 ui.foo=bar
218 219 ui.nontty=true
219 220 web.address=localhost
@@ -226,6 +227,7 b' check that local configs for the cached '
226 227 ui.detailed-exit-code=True
227 228 ui.merge=internal:merge
228 229 ui.mergemarkers=detailed
230 ui.timeout.warn=15
229 231 ui.nontty=true
230 232 #endif
231 233
@@ -56,7 +56,7 b' One process waiting for another'
56 56 > EOF
57 57 $ echo b > b/b
58 58 $ hg -R b ci -A -m b --config hooks.precommit="python:`pwd`/hooks.py:sleepone" > stdout &
59 $ hg -R b up -q --config hooks.pre-update="python:`pwd`/hooks.py:sleephalf" \
59 $ hg -R b up -q --config ui.timeout.warn=0 --config hooks.pre-update="python:`pwd`/hooks.py:sleephalf" \
60 60 > > preup-stdout 2>preup-stderr
61 61 $ wait
62 62 $ cat preup-stdout
@@ -1322,7 +1322,7 b' 3. Test that push is prevented if lock w'
1322 1322 error, but EEXIST)
1323 1323
1324 1324 $ touch .hg/store/lock
1325 $ hg push ../Phi --config ui.timeout=1
1325 $ hg push ../Phi --config ui.timeout=1 --config ui.timeout.warn=0
1326 1326 pushing to ../Phi
1327 1327 waiting for lock on repository $TESTTMP/Upsilon held by ''
1328 1328 abort: repository $TESTTMP/Upsilon: timed out waiting for lock held by ''
General Comments 0
You need to be logged in to leave comments. Login now