# HG changeset patch # User FUJIWARA Katsunori # Date 1499883479 -32400 # Node ID 435f63d12475766deec025ce68e26ff24ef4566c # Parent 1bdafe1111ce53e1204a407705a8b24024893642 tests: avoid tests related to directory permission if running with fsmonitor diff -r 1bdafe1111ce -r 435f63d12475 tests/blacklists/fsmonitor --- a/tests/blacklists/fsmonitor Thu Jul 13 03:17:58 2017 +0900 +++ b/tests/blacklists/fsmonitor Thu Jul 13 03:17:59 2017 +0900 @@ -23,9 +23,7 @@ test-largefiles.t test-lfconvert.t test-nested-repo.t -test-permissions.t test-push-warn.t test-subrepo-deep-nested-change.t test-subrepo-recursion.t test-subrepo.t -test-tags.t diff -r 1bdafe1111ce -r 435f63d12475 tests/test-permissions.t --- a/tests/test-permissions.t Thu Jul 13 03:17:58 2017 +0900 +++ b/tests/test-permissions.t Thu Jul 13 03:17:59 2017 +0900 @@ -61,10 +61,17 @@ M a ? dir/a $ chmod -rx dir + +#if no-fsmonitor + +(fsmonitor makes "hg status" avoid accessing to "dir") + $ hg status dir: Permission denied M a +#endif + Reenable perm to allow deletion: $ chmod +rx dir diff -r 1bdafe1111ce -r 435f63d12475 tests/test-tags.t --- a/tests/test-tags.t Thu Jul 13 03:17:58 2017 +0900 +++ b/tests/test-tags.t Thu Jul 13 03:17:59 2017 +0900 @@ -118,13 +118,17 @@ And again, but now unable to write tag cache or lock file: -#if unix-permissions +#if unix-permissions no-fsmonitor + $ rm -f .hg/cache/tags2-visible .hg/cache/hgtagsfnodes1 $ chmod 555 .hg/cache $ hg identify b9154636be93 tip $ chmod 755 .hg/cache +(this block should be protected by no-fsmonitor, because "chmod 555 .hg" +makes watchman fail at accessing to files under .hg) + $ chmod 555 .hg $ hg identify b9154636be93 tip