Mercurial > hg
changeset 33425:886207fb18ab
tests: take extra care for fsmonitor at enabling incompatible extension
This is worthwhile, because these tests don't focus mainly on using
incompatible extensions itself.
| author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
|---|---|
| date | Thu, 13 Jul 2017 03:17:58 +0900 |
| parents | 3ccf559606af |
| children | 29653495cece |
| files | tests/blacklists/fsmonitor tests/test-blackbox.t tests/test-copy.t |
| diffstat | 3 files changed, 8 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/blacklists/fsmonitor Thu Jul 13 03:17:57 2017 +0900 +++ b/tests/blacklists/fsmonitor Thu Jul 13 03:17:58 2017 +0900 @@ -4,9 +4,7 @@ # with fsmonitor, use subrepositories, or don't anticipate the extra file in # the .hg directory that fsmonitor adds. test-basic.t -test-blackbox.t test-commandserver.t -test-copy.t test-debugextensions.t test-eol-add.t test-eol-clone.t
--- a/tests/test-blackbox.t Thu Jul 13 03:17:57 2017 +0900 +++ b/tests/test-blackbox.t Thu Jul 13 03:17:58 2017 +0900 @@ -135,10 +135,17 @@ $ echo '[hooks]' >> .hg/hgrc $ echo 'update = echo hooked' >> .hg/hgrc $ hg update + The fsmonitor extension is incompatible with the eol extension and has been disabled. (fsmonitor !) hooked 1 files updated, 0 files merged, 0 files removed, 0 files unresolved updated to "d02f48003e62: c" 1 other heads for branch "default" + $ cat >> .hg/hgrc <<EOF + > [extensions] + > # disable eol, because it is not needed for subsequent tests + > # (in addition, keeping it requires extra care for fsmonitor) + > eol=! + > EOF $ hg blackbox -l 6 1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> update 1970/01/01 00:00:00 bob @6563da9dcf87b1949716e38ff3e3dfaa3198eb06 (5000)> writing .hg/cache/tags2-visible with 0 tags
--- a/tests/test-copy.t Thu Jul 13 03:17:57 2017 +0900 +++ b/tests/test-copy.t Thu Jul 13 03:17:58 2017 +0900 @@ -192,6 +192,7 @@ XXX: filtering lfilesrepo.status() in 3.3-rc causes the copy source to not be displayed. $ hg st -C --config extensions.largefiles= + The fsmonitor extension is incompatible with the largefiles extension and has been disabled. (fsmonitor !) M bar foo