Patchwork [1,of,7] tests: add fsmonitor specific output lines at enabling largefiles

login
register
mail settings
Submitter Katsunori FUJIWARA
Date July 2, 2017, 5:53 p.m.
Message ID <b756789234c89d1a3812.1499017995@speaknoevil>
Download mbox | patch
Permalink /patch/21918/
State Accepted
Headers show

Comments

Katsunori FUJIWARA - July 2, 2017, 5:53 p.m.
# HG changeset patch
# User FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
# Date 1499017959 -32400
#      Mon Jul 03 02:52:39 2017 +0900
# Node ID b756789234c89d1a381268f0840feb346fa052e0
# Parent  edb7f628ef8bb834ba3772df62a887eba5a931db
tests: add fsmonitor specific output lines at enabling largefiles

Temporarily enabling largefiles causes these output lines, only if
tests are executed with fsmonitor.

Patch

diff --git a/tests/test-fileset-generated.t b/tests/test-fileset-generated.t
--- a/tests/test-fileset-generated.t
+++ b/tests/test-fileset-generated.t
@@ -81,6 +81,7 @@  Test log
   
 Largefiles doesn't crash
   $ hg log -T '{rev}\n' --stat 'set:modified()' --config extensions.largefiles=
+  The fsmonitor extension is incompatible with the largefiles extension and has been disabled. (fsmonitor !)
   1
    content1_content2_content1-tracked |  2 +-
    content1_content2_content3-tracked |  2 +-
diff --git a/tests/test-histedit-fold.t b/tests/test-histedit-fold.t
--- a/tests/test-histedit-fold.t
+++ b/tests/test-histedit-fold.t
@@ -488,6 +488,7 @@  into the hook command.
   $ echo "foo" > amended.txt
   $ hg add amended.txt
   $ hg ci -q --config extensions.largefiles= --amend -I amended.txt
+  The fsmonitor extension is incompatible with the largefiles extension and has been disabled. (fsmonitor !)
 
 Test that folding multiple changes in a row doesn't show multiple
 editors.
diff --git a/tests/test-hook.t b/tests/test-hook.t
--- a/tests/test-hook.t
+++ b/tests/test-hook.t
@@ -730,6 +730,7 @@  final release (and dirstate flush).
   $ hg ci -ma
   223eafe2750c tip
   $ hg up 0 --config extensions.largefiles=
+  The fsmonitor extension is incompatible with the largefiles extension and has been disabled. (fsmonitor !)
   cb9a9f314b8b
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
diff --git a/tests/test-init.t b/tests/test-init.t
--- a/tests/test-init.t
+++ b/tests/test-init.t
@@ -135,6 +135,8 @@  clone to remote1
 
 The largefiles extension doesn't crash
   $ hg clone -e "python \"$TESTDIR/dummyssh\"" local ssh://user@dummy/remotelf --config extensions.largefiles=
+  The fsmonitor extension is incompatible with the largefiles extension and has been disabled. (fsmonitor !)
+  The fsmonitor extension is incompatible with the largefiles extension and has been disabled. (fsmonitor !)
   searching for changes
   remote: adding changesets
   remote: adding manifests
diff --git a/tests/test-log.t b/tests/test-log.t
--- a/tests/test-log.t
+++ b/tests/test-log.t
@@ -47,6 +47,7 @@  changeset graph
 
 Make sure largefiles doesn't interfere with logging a regular file
   $ hg --debug log a -T '{rev}: {desc}\n' --config extensions.largefiles=
+  The fsmonitor extension is incompatible with the largefiles extension and has been disabled. (fsmonitor !)
   updated patterns: .hglf/a, a
   0: a
   $ hg log a
@@ -67,6 +68,7 @@  Make sure largefiles doesn't interfere w
   summary:     a
   
   $ hg --debug log glob:a* -T '{rev}: {desc}\n' --config extensions.largefiles=
+  The fsmonitor extension is incompatible with the largefiles extension and has been disabled. (fsmonitor !)
   updated patterns: glob:.hglf/a*, glob:a*
   3: d
   0: a
@@ -2077,6 +2079,7 @@  hg log -f dir across branches
   
 Ensure that largefiles doesn't interfere with following a normal file
   $ hg  --config extensions.largefiles= log -f d -T '{desc}' -G
+  The fsmonitor extension is incompatible with the largefiles extension and has been disabled. (fsmonitor !)
   @  c
   |
   o  a
diff --git a/tests/test-rename.t b/tests/test-rename.t
--- a/tests/test-rename.t
+++ b/tests/test-rename.t
@@ -625,6 +625,7 @@  check illegal path components
   abort: path contains illegal component: .hg/a1 (glob)
   [255]
   $ hg --config extensions.largefiles= rename d1/d11/a1 .hg
+  The fsmonitor extension is incompatible with the largefiles extension and has been disabled. (fsmonitor !)
   abort: path contains illegal component: .hg/a1 (glob)
   [255]
   $ hg status -C
@@ -632,6 +633,7 @@  check illegal path components
   abort: ../a1 not under root '$TESTTMP' (glob)
   [255]
   $ hg --config extensions.largefiles= rename d1/d11/a1 ..
+  The fsmonitor extension is incompatible with the largefiles extension and has been disabled. (fsmonitor !)
   abort: ../a1 not under root '$TESTTMP' (glob)
   [255]
   $ hg status -C
diff --git a/tests/test-share.t b/tests/test-share.t
--- a/tests/test-share.t
+++ b/tests/test-share.t
@@ -243,6 +243,8 @@  test that commits work
 non largefiles repos won't enable largefiles
 
   $ hg share --config extensions.largefiles= repo3 sharedrepo
+  The fsmonitor extension is incompatible with the largefiles extension and has been disabled. (fsmonitor !)
+  The fsmonitor extension is incompatible with the largefiles extension and has been disabled. (fsmonitor !)
   updating working directory
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ [ -f sharedrepo/.hg/hgrc ]