Skip to content

Commit 44e03bf

Browse files
committed
Merge branch 'sv/t9801-test-path-is-file-cleanup'
Test cleanup. * sv/t9801-test-path-is-file-cleanup: t9801: replace test -f with test_path_is_file
2 parents c83d602 + 12604a8 commit 44e03bf

File tree

1 file changed

+19
-19
lines changed

1 file changed

+19
-19
lines changed

t/t9801-git-p4-branch.sh

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -203,19 +203,19 @@ test_expect_success 'git p4 clone simple branches' '
203203
git p4 clone --dest=. --detect-branches //depot@all &&
204204
git log --all --graph --decorate --stat &&
205205
git reset --hard p4/depot/branch1 &&
206-
test -f file1 &&
207-
test -f file2 &&
208-
test -f file3 &&
206+
test_path_is_file file1 &&
207+
test_path_is_file file2 &&
208+
test_path_is_file file3 &&
209209
grep update file2 &&
210210
git reset --hard p4/depot/branch2 &&
211-
test -f file1 &&
212-
test -f file2 &&
211+
test_path_is_file file1 &&
212+
test_path_is_file file2 &&
213213
test ! -f file3 &&
214214
! grep update file2 &&
215215
git reset --hard p4/depot/branch3 &&
216-
test -f file1 &&
217-
test -f file2 &&
218-
test -f file3 &&
216+
test_path_is_file file1 &&
217+
test_path_is_file file2 &&
218+
test_path_is_file file3 &&
219219
grep update file2 &&
220220
cd "$cli" &&
221221
cd branch1 &&
@@ -606,22 +606,22 @@ test_expect_success 'git p4 clone simple branches with base folder on server sid
606606
git p4 clone --dest=. --use-client-spec --detect-branches //depot@all &&
607607
git log --all --graph --decorate --stat &&
608608
git reset --hard p4/depot/branch1 &&
609-
test -f file1 &&
610-
test -f file2 &&
611-
test -f file3 &&
612-
test -f sub_file1 &&
609+
test_path_is_file file1 &&
610+
test_path_is_file file2 &&
611+
test_path_is_file file3 &&
612+
test_path_is_file sub_file1 &&
613613
grep update file2 &&
614614
git reset --hard p4/depot/branch2 &&
615-
test -f file1 &&
616-
test -f file2 &&
615+
test_path_is_file file1 &&
616+
test_path_is_file file2 &&
617617
test ! -f file3 &&
618-
test -f sub_file1 &&
618+
test_path_is_file sub_file1 &&
619619
! grep update file2 &&
620620
git reset --hard p4/depot/branch3 &&
621-
test -f file1 &&
622-
test -f file2 &&
623-
test -f file3 &&
624-
test -f sub_file1 &&
621+
test_path_is_file file1 &&
622+
test_path_is_file file2 &&
623+
test_path_is_file file3 &&
624+
test_path_is_file sub_file1 &&
625625
grep update file2 &&
626626
cd "$cli" &&
627627
cd branch1 &&

0 commit comments

Comments
 (0)