Patchwork [3,of,7] tests: take extra care for fsmonitor at enabling incompatible extension

login
register
mail settings
Submitter Katsunori FUJIWARA
Date July 12, 2017, 6:22 p.m.
Message ID <ade468df596d7c00c74f.1499883730@speaknoevil>
Download mbox | patch
Permalink /patch/22272/
State Accepted
Headers show

Comments

Katsunori FUJIWARA - July 12, 2017, 6:22 p.m.
# HG changeset patch
# User FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
# Date 1499883478 -32400
#      Thu Jul 13 03:17:58 2017 +0900
# Node ID ade468df596d7c00c74fd71b5845fdb7cf464930
# Parent  5e5e7e76130ef77d04f26d9ed90f05567e18336e
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.

Patch

diff --git a/tests/blacklists/fsmonitor b/tests/blacklists/fsmonitor
--- a/tests/blacklists/fsmonitor
+++ b/tests/blacklists/fsmonitor
@@ -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
diff --git a/tests/test-blackbox.t b/tests/test-blackbox.t
--- a/tests/test-blackbox.t
+++ b/tests/test-blackbox.t
@@ -135,10 +135,17 @@  extension and python hooks - use the eol
   $ 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
diff --git a/tests/test-copy.t b/tests/test-copy.t
--- a/tests/test-copy.t
+++ b/tests/test-copy.t
@@ -192,6 +192,7 @@  should show copy
 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