# HG changeset patch # User FUJIWARA Katsunori # Date 2017-07-02 17:52:39 # Node ID 0bec70c1df15af2da10d71d70e45a9cfeff79ff1 # Parent fe0667cc521e793a560ddbcf2718cf8c19bc7cf1 tests: make output lines conditional for testing with fsmonitor Repository cloned-bookmark-default and tobundle exist in the working directory of main test repository "repo". We should take care for them, because it is known issue that fsmonitor can't handle nested repositories. These nested repositories are cloned from "repo", and the number of unknown files = files in these repositories (including files under .hg) will be changed easily in the future. But testing with fsmonitor is not ordinary. Therefore, test-bookmarks.t with fsmonitor might be broken silently. This is reason why this patch uses "(glob)" for the number of unknown files in "hg summary" output. BTW, this patch doesn't use .hgignore to make test portable, because .hgignore might cause another issue related to "walk_on_invalidate" configuration of fsmonitor. diff --git a/tests/test-bookmarks.t b/tests/test-bookmarks.t --- a/tests/test-bookmarks.t +++ b/tests/test-bookmarks.t @@ -589,12 +589,17 @@ create bundle with two heads update to active bookmark if it's not the parent +(it is known issue that fsmonitor can't handle nested repositories. In +this test scenario, cloned-bookmark-default and tobundle exist in the +working directory of current repository) + $ hg summary parent: 2:db815d6d32e6 2 branch: default bookmarks: *Z Y x y - commit: 1 added, 1 unknown (new branch head) + commit: 1 added, 1 unknown (new branch head) (no-fsmonitor !) + commit: 1 added, * unknown (new branch head) (glob) (fsmonitor !) update: 2 new changesets (update) phases: 5 draft $ hg update @@ -774,6 +779,10 @@ tipmost surviving ancestor of the stripp no-op update doesn't deactivate bookmarks +(it is known issue that fsmonitor can't handle nested repositories. In +this test scenario, cloned-bookmark-default and tobundle exist in the +working directory of current repository) + $ hg bookmarks * four 3:9ba5f110a0b3 should-end-on-two 2:db815d6d32e6 @@ -786,7 +795,8 @@ no-op update doesn't deactivate bookmark y branch: test bookmarks: *four - commit: 2 unknown (clean) + commit: 2 unknown (clean) (no-fsmonitor !) + commit: * unknown (clean) (glob) (fsmonitor !) update: (current) phases: 4 draft