Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[PATCH v3] [OUTREACHY] t7001-mv.sh : Use test_path_is_* functions in test script #1372

Closed
wants to merge 1 commit into from
Closed

[PATCH v3] [OUTREACHY] t7001-mv.sh : Use test_path_is_* functions in test script #1372

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
62 changes: 31 additions & 31 deletions t/t7001-mv.sh
View file
Open in desktop
Expand Up @@ -60,8 +60,8 @@ test_expect_success 'checking the commit' '

test_expect_success 'mv --dry-run does not move file' '
git mv -n path0/COPYING MOVED &&
test -f path0/COPYING &&
test ! -f MOVED
test_path_is_file path0/COPYING &&
test_path_is_missing MOVED
'

test_expect_success 'checking -k on non-existing file' '
Expand All @@ -71,25 +71,25 @@ test_expect_success 'checking -k on non-existing file' '
test_expect_success 'checking -k on untracked file' '
>untracked1 &&
git mv -k untracked1 path0 &&
test -f untracked1 &&
test ! -f path0/untracked1
test_path_is_file untracked1 &&
test_path_is_missing path0/untracked1
'

test_expect_success 'checking -k on multiple untracked files' '
>untracked2 &&
git mv -k untracked1 untracked2 path0 &&
test -f untracked1 &&
test -f untracked2 &&
test ! -f path0/untracked1 &&
test ! -f path0/untracked2
test_path_is_file untracked1 &&
test_path_is_file untracked2 &&
test_path_is_missing path0/untracked1 &&
test_path_is_missing path0/untracked2
'

test_expect_success 'checking -f on untracked file with existing target' '
>path0/untracked1 &&
test_must_fail git mv -f untracked1 path0 &&
test ! -f .git/index.lock &&
test -f untracked1 &&
test -f path0/untracked1
test_path_is_missing .git/index.lock &&
test_path_is_file untracked1 &&
test_path_is_file path0/untracked1
'

# clean up the mess in case bad things happen
Expand Down Expand Up @@ -215,8 +215,8 @@ test_expect_success 'absolute pathname' '
git add sub/file &&

git mv sub "$(pwd)/in" &&
! test -d sub &&
test -d in &&
test_path_is_missing sub &&
test_path_is_dir in &&
git ls-files --error-unmatch in/file
)
'
Expand All @@ -234,8 +234,8 @@ test_expect_success 'absolute pathname outside should fail' '
git add sub/file &&

test_must_fail git mv sub "$out/out" &&
test -d sub &&
! test -d ../in &&
test_path_is_dir sub &&
test_path_is_missing ../in &&
git ls-files --error-unmatch sub/file
)
'
Expand Down Expand Up @@ -295,8 +295,8 @@ test_expect_success 'git mv should overwrite symlink to a file' '
git add moved &&
test_must_fail git mv moved symlink &&
git mv -f moved symlink &&
! test -e moved &&
test -f symlink &&
test_path_is_missing moved &&
test_path_is_file symlink &&
test "$(cat symlink)" = 1 &&
git update-index --refresh &&
git diff-files --quiet
Expand All @@ -312,13 +312,13 @@ test_expect_success 'git mv should overwrite file with a symlink' '
git add moved &&
test_must_fail git mv symlink moved &&
git mv -f symlink moved &&
! test -e symlink &&
test_path_is_missing symlink &&
git update-index --refresh &&
git diff-files --quiet
'

test_expect_success SYMLINKS 'check moved symlink' '
test -h moved
test_path_is_symlink moved
'

rm -f moved symlink
Expand Down Expand Up @@ -352,7 +352,7 @@ test_expect_success 'git mv moves a submodule with a .git directory and no .gitm
) &&
mkdir mod &&
git mv sub mod/sub &&
! test -e sub &&
test_path_is_missing sub &&
test "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" &&
git -C mod/sub status &&
git update-index --refresh &&
Expand All @@ -372,7 +372,7 @@ test_expect_success 'git mv moves a submodule with a .git directory and .gitmodu
) &&
mkdir mod &&
git mv sub mod/sub &&
! test -e sub &&
test_path_is_missing sub &&
test "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" &&
git -C mod/sub status &&
echo mod/sub >expected &&
Expand All @@ -389,7 +389,7 @@ test_expect_success 'git mv moves a submodule with gitfile' '
entry="$(git ls-files --stage sub | cut -f 1)" &&
mkdir mod &&
git -C mod mv ../sub/ . &&
! test -e sub &&
test_path_is_missing sub &&
test "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" &&
git -C mod/sub status &&
echo mod/sub >expected &&
Expand All @@ -408,7 +408,7 @@ test_expect_success 'mv does not complain when no .gitmodules file is found' '
mkdir mod &&
git mv sub mod/sub 2>actual.err &&
test_must_be_empty actual.err &&
! test -e sub &&
test_path_is_missing sub &&
test "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" &&
git -C mod/sub status &&
git update-index --refresh &&
Expand All @@ -423,13 +423,13 @@ test_expect_success 'mv will error out on a modified .gitmodules file unless sta
entry="$(git ls-files --stage sub | cut -f 1)" &&
mkdir mod &&
test_must_fail git mv sub mod/sub 2>actual.err &&
test -s actual.err &&
test -e sub &&
test_file_not_empty actual.err &&
test_path_exists sub &&
git diff-files --quiet -- sub &&
git add .gitmodules &&
git mv sub mod/sub 2>actual.err &&
test_must_be_empty actual.err &&
! test -e sub &&
test_path_is_missing sub &&
test "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" &&
git -C mod/sub status &&
git update-index --refresh &&
Expand All @@ -447,7 +447,7 @@ test_expect_success 'mv issues a warning when section is not found in .gitmodule
mkdir mod &&
git mv sub mod/sub 2>actual.err &&
test_cmp expect.err actual.err &&
! test -e sub &&
test_path_is_missing sub &&
test "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" &&
git -C mod/sub status &&
git update-index --refresh &&
Expand All @@ -460,7 +460,7 @@ test_expect_success 'mv --dry-run does not touch the submodule or .gitmodules' '
git submodule update &&
mkdir mod &&
git mv -n sub mod/sub 2>actual.err &&
test -f sub/.git &&
test_path_is_file sub/.git &&
git diff-index --exit-code HEAD &&
git update-index --refresh &&
git diff-files --quiet -- sub .gitmodules
Expand All @@ -474,10 +474,10 @@ test_expect_success 'checking out a commit before submodule moved needs manual u
git status -s sub2 >actual &&
echo "?? sub2/" >expected &&
test_cmp expected actual &&
! test -f sub/.git &&
test -f sub2/.git &&
test_path_is_missing sub/.git &&
test_path_is_file sub2/.git &&
git submodule update &&
test -f sub/.git &&
test_path_is_file sub/.git &&
rm -rf sub2 &&
git diff-index --exit-code HEAD &&
git update-index --refresh &&
Expand Down