From: Jeff Hostetler <jeffhost@xxxxxxxxxxxxx>
Create unit tests to move a directory. Verify that `git status`
gives the same result with and without FSMonitor enabled.
NEEDSWORK: This test exposes a bug in the untracked-cache on
Windows when FSMonitor is disabled. These are commented out
for the moment.
Signed-off-by: Jeff Hostetler <jeffhost@xxxxxxxxxxxxx>
---
t/t7527-builtin-fsmonitor.sh | 39 ++++++++++++++++++++++++++++++++++++
1 file changed, 39 insertions(+)
diff --git a/t/t7527-builtin-fsmonitor.sh b/t/t7527-builtin-fsmonitor.sh
index 429029fcadd..bc66d8285a3 100755
--- a/t/t7527-builtin-fsmonitor.sh
+++ b/t/t7527-builtin-fsmonitor.sh
@@ -281,6 +281,16 @@ test_expect_success 'setup' '
trace*
EOF
+ mkdir -p T1/T2/T3/T4 &&
+ echo 1 >T1/F1 &&
+ echo 1 >T1/T2/F1 &&
+ echo 1 >T1/T2/T3/F1 &&
+ echo 1 >T1/T2/T3/T4/F1 &&
+ echo 2 >T1/F2 &&
+ echo 2 >T1/T2/F2 &&
+ echo 2 >T1/T2/T3/F2 &&
+ echo 2 >T1/T2/T3/T4/F2 &&
+
git -c core.fsmonitor=false add . &&
test_tick &&
git -c core.fsmonitor=false commit -m initial &&
@@ -363,6 +373,19 @@ directory_to_file () {
echo 1 >dir1
}
+move_directory_contents_deeper() {
+ mkdir T1/_new_ &&
+ mv T1/[A-Z]* T1/_new_
+}
+
+move_directory_up() {
+ mv T1/T2/T3 T1
+}
+
+move_directory() {
+ mv T1/T2/T3 T1/T2/NewT3
+}
+
# The next few test cases confirm that our fsmonitor daemon sees each type
# of OS filesystem notification that we care about. At this layer we just
# ensure we are getting the OS notifications and do not try to confirm what
@@ -645,6 +668,22 @@ do
matrix_try $uc_val $fsm_val file_to_directory
matrix_try $uc_val $fsm_val directory_to_file
+ # NEEDSWORK: On Windows the untracked-cache is buggy when FSMonitor
+ # is DISABLED. Turn off a few test that cause it problems until
+ # we can debug it.
+ #
+ try_moves="true"
+ test_have_prereq UNTRACKED_CACHE,WINDOWS && \
+ test $uc_val = true && \
+ test $fsm_val = false && \
+ try_moves="false"
+ if test $try_moves = true
+ then
+ matrix_try $uc_val $fsm_val move_directory_contents_deeper
+ matrix_try $uc_val $fsm_val move_directory_up
+ matrix_try $uc_val $fsm_val move_directory
+ fi
+
if test $fsm_val = true
then
test_expect_success "Matrix[uc:$uc_val][fsm:$fsm_val] disable fsmonitor at end" '
--
gitgitgadget
