Mercurial > hg-stable
changeset 24751:dc4daf028f9c
run-test: enable the devel warning during tests
This should help us to catch new locking order issues as soon as possible.
There are two harmless test updates (from the config change). Moreover, some
bundle2 tests are displaying warning for a legitimate reason. The use of pushkey
during the unbundle process may requires the 'wlock' after 'lock' (around the
whole unbundle process was taken). This is non-trivial to fix, so I better have
the check on, with the warning in the test than the check off. See issue4596 for
details.
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Sun, 12 Apr 2015 09:46:03 -0400 |
| parents | aaf835407bf2 |
| children | 5640efd1b160 |
| files | tests/run-tests.py tests/test-basic.t tests/test-bundle2-exchange.t tests/test-bundle2-pushback.t tests/test-commandserver.t |
| diffstat | 5 files changed, 8 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/run-tests.py Sun Apr 12 15:37:59 2015 -0400 +++ b/tests/run-tests.py Sun Apr 12 09:46:03 2015 -0400 @@ -705,6 +705,8 @@ hgrc.write('commit = -d "0 0"\n') hgrc.write('shelve = --date "0 0"\n') hgrc.write('tag = -d "0 0"\n') + hgrc.write('[devel]\n') + hgrc.write('all = true\n') hgrc.write('[largefiles]\n') hgrc.write('usercache = %s\n' % (os.path.join(self._testtmp, '.cache/largefiles')))
--- a/tests/test-basic.t Sun Apr 12 15:37:59 2015 -0400 +++ b/tests/test-basic.t Sun Apr 12 09:46:03 2015 -0400 @@ -5,6 +5,7 @@ defaults.commit=-d "0 0" defaults.shelve=--date "0 0" defaults.tag=-d "0 0" + devel.all=true largefiles.usercache=$TESTTMP/.cache/largefiles (glob) ui.slash=True ui.interactive=False
--- a/tests/test-bundle2-exchange.t Sun Apr 12 15:37:59 2015 -0400 +++ b/tests/test-bundle2-exchange.t Sun Apr 12 09:46:03 2015 -0400 @@ -226,6 +226,7 @@ remote: adding file changes remote: added 1 changesets with 0 changes to 0 files (-1 heads) remote: 1 new obsolescence markers + remote: "wlock" acquired after "lock" at: */mercurial/bookmarks.py:259 (pushbookmark) (glob) updating bookmark book_eea1 pre-close-tip:02de42196ebe draft book_02de postclose-tip:02de42196ebe draft book_02de @@ -304,6 +305,7 @@ remote: adding file changes remote: added 1 changesets with 1 changes to 1 files remote: 1 new obsolescence markers + remote: "wlock" acquired after "lock" at: */mercurial/bookmarks.py:259 (pushbookmark) (glob) updating bookmark book_5fdd remote: pre-close-tip:5fddd98957c8 draft book_5fdd remote: pushkey: lock state after "bookmarks" @@ -355,6 +357,7 @@ remote: adding file changes remote: added 1 changesets with 1 changes to 1 files remote: 1 new obsolescence markers + remote: "wlock" acquired after "lock" at: */mercurial/bookmarks.py:259 (pushbookmark) (glob) updating bookmark book_32af pre-close-tip:02de42196ebe draft book_02de postclose-tip:02de42196ebe draft book_02de
--- a/tests/test-bundle2-pushback.t Sun Apr 12 15:37:59 2015 -0400 +++ b/tests/test-bundle2-pushback.t Sun Apr 12 09:46:03 2015 -0400 @@ -91,6 +91,7 @@ $ hg push pushing to ssh://user@dummy/server searching for changes + "wlock" acquired after "lock" at: */mercurial/bookmarks.py:259 (pushbookmark) (glob) remote: adding changesets remote: adding manifests remote: adding file changes
--- a/tests/test-commandserver.t Sun Apr 12 15:37:59 2015 -0400 +++ b/tests/test-commandserver.t Sun Apr 12 09:46:03 2015 -0400 @@ -178,6 +178,7 @@ defaults.commit=-d "0 0" defaults.shelve=--date "0 0" defaults.tag=-d "0 0" + devel.all=true largefiles.usercache=$TESTTMP/.cache/largefiles ui.slash=True ui.interactive=False