changeset 40833:f6d37e84d8f9

tests: stabilize for recent wcache changes This goes with 47e3f554df35::d5622dfe4ba3. I'm not sure if it was really expected that there would be no wcache directory if neither execbit nor symlink is supported.
author Matt Harbison <matt_harbison@yahoo.com>
date Tue, 04 Dec 2018 00:16:12 -0500
parents 151aec6494a8
children c460b1643eb0
files tests/test-fncache.t tests/test-hardlinks.t tests/test-share.t tests/test-subrepo.t
diffstat 4 files changed, 15 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-fncache.t	Mon Dec 03 12:48:42 2018 -0500
+++ b/tests/test-fncache.t	Tue Dec 04 00:16:12 2018 -0500
@@ -108,9 +108,9 @@
   .hg/undo.dirstate
   .hg/undo.phaseroots
   .hg/wcache
-  .hg/wcache/checkisexec
-  .hg/wcache/checklink
-  .hg/wcache/checklink-target
+  .hg/wcache/checkisexec (execbit !)
+  .hg/wcache/checklink (symlink !)
+  .hg/wcache/checklink-target (symlink !)
   $ cd ..
 
 Non fncache repo:
@@ -149,9 +149,9 @@
   .hg/undo.desc
   .hg/undo.dirstate
   .hg/wcache
-  .hg/wcache/checkisexec
-  .hg/wcache/checklink
-  .hg/wcache/checklink-target
+  .hg/wcache/checkisexec (execbit !)
+  .hg/wcache/checklink (symlink !)
+  .hg/wcache/checklink-target (symlink !)
   $ cd ..
 
 Encoding of reserved / long paths in the store
--- a/tests/test-hardlinks.t	Mon Dec 03 12:48:42 2018 -0500
+++ b/tests/test-hardlinks.t	Tue Dec 04 00:16:12 2018 -0500
@@ -265,9 +265,9 @@
   2 r4/.hg/undo.branch
   2 r4/.hg/undo.desc
   [24] r4/\.hg/undo\.dirstate (re)
-  2 r4/.hg/wcache/checkisexec
-  2 r4/.hg/wcache/checklink-target
-  2 r4/.hg/wcache/checknoexec
+  2 r4/.hg/wcache/checkisexec (execbit !)
+  2 r4/.hg/wcache/checklink-target (symlink !)
+  2 r4/.hg/wcache/checknoexec (execbit !)
   2 r4/d1/data1
   2 r4/d1/f2
   2 r4/f1
@@ -316,9 +316,9 @@
   2 r4/.hg/undo.branch
   2 r4/.hg/undo.desc
   [24] r4/\.hg/undo\.dirstate (re)
-  2 r4/.hg/wcache/checkisexec
-  2 r4/.hg/wcache/checklink-target
-  2 r4/.hg/wcache/checknoexec
+  2 r4/.hg/wcache/checkisexec (execbit !)
+  2 r4/.hg/wcache/checklink-target (symlink !)
+  2 r4/.hg/wcache/checknoexec (execbit !)
   2 r4/d1/data1
   2 r4/d1/f2
   1 r4/f1
--- a/tests/test-share.t	Mon Dec 03 12:48:42 2018 -0500
+++ b/tests/test-share.t	Tue Dec 04 00:16:12 2018 -0500
@@ -31,7 +31,6 @@
   $ test -d .hg/cache
   [1]
   $ ls -1 .hg/wcache || true
-  ls: .hg/wcache: $ENOENT$ (no-execbit no-symlink !)
   checkisexec (execbit !)
   checklink (symlink !)
   checklink-target (symlink !)
--- a/tests/test-subrepo.t	Mon Dec 03 12:48:42 2018 -0500
+++ b/tests/test-subrepo.t	Tue Dec 04 00:16:12 2018 -0500
@@ -1254,9 +1254,9 @@
   ../shared/subrepo-2/.hg/requires
   ../shared/subrepo-2/.hg/sharedpath
   ../shared/subrepo-2/.hg/wcache
-  ../shared/subrepo-2/.hg/wcache/checkisexec
-  ../shared/subrepo-2/.hg/wcache/checklink
-  ../shared/subrepo-2/.hg/wcache/checklink-target
+  ../shared/subrepo-2/.hg/wcache/checkisexec (execbit !)
+  ../shared/subrepo-2/.hg/wcache/checklink (symlink !)
+  ../shared/subrepo-2/.hg/wcache/checklink-target (symlink !)
   ../shared/subrepo-2/file
   $ hg -R ../shared in
   abort: repository default not found!