Skip to content

Commit c257bbb

Browse files
gitstergitster
committed
Merge branch 'jn/tests'
* jn/tests: t3000 (ls-files -o): modernize style
2 parents 90a0f1b + bcefed4 commit c257bbb

File tree

1 file changed

+42
-47
lines changed

1 file changed

+42
-47
lines changed

‎t/t3000-ls-files-others.sh‎

Lines changed: 42 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -17,57 +17,52 @@ filesystem.
1717
'
1818
. ./test-lib.sh
1919

20-
date >path0
21-
if test_have_prereq SYMLINKS
22-
then
23-
ln -s xyzzy path1
24-
else
25-
date > path1
26-
fi
27-
mkdir path2 path3 path4
28-
date >path2/file2
29-
date >path2-junk
30-
date >path3/file3
31-
date >path3-junk
32-
git update-index --add path3-junk path3/file3
33-
34-
cat >expected1 <<EOF
35-
expected1
36-
expected2
37-
expected3
38-
output
39-
path0
40-
path1
41-
path2-junk
42-
path2/file2
43-
EOF
44-
sed -e 's|path2/file2|path2/|' <expected1 >expected2
45-
cat <expected2 >expected3
46-
echo path4/ >>expected2
47-
48-
test_expect_success \
49-
'git ls-files --others to show output.' \
50-
'git ls-files --others >output'
51-
52-
test_expect_success \
53-
'git ls-files --others should pick up symlinks.' \
54-
'test_cmp expected1 output'
20+
test_expect_success 'setup ' '
21+
date >path0 &&
22+
if test_have_prereq SYMLINKS
23+
then
24+
ln -s xyzzy path1
25+
else
26+
date >path1
27+
fi &&
28+
mkdir path2 path3 path4 &&
29+
date >path2/file2 &&
30+
date >path2-junk &&
31+
date >path3/file3 &&
32+
date >path3-junk &&
33+
git update-index --add path3-junk path3/file3
34+
'
5535

56-
test_expect_success \
57-
'git ls-files --others --directory to show output.' \
58-
'git ls-files --others --directory >output'
36+
test_expect_success 'setup: expected output' '
37+
cat >expected1 <<-\EOF &&
38+
expected1
39+
expected2
40+
expected3
41+
output
42+
path0
43+
path1
44+
path2-junk
45+
path2/file2
46+
EOF
5947
48+
sed -e "s|path2/file2|path2/|" <expected1 >expected2 &&
49+
cp expected2 expected3 &&
50+
echo path4/ >>expected2
51+
'
6052

61-
test_expect_success \
62-
'git ls-files --others --directory should not get confused.' \
63-
'test_cmp expected2 output'
53+
test_expect_success 'ls-files --others' '
54+
git ls-files --others >output &&
55+
test_cmp expected1 output
56+
'
6457

65-
test_expect_success \
66-
'git ls-files --others --directory --no-empty-directory to show output.' \
67-
'git ls-files --others --directory --no-empty-directory >output'
58+
test_expect_success 'ls-files --others --directory' '
59+
git ls-files --others --directory >output &&
60+
test_cmp expected2 output
61+
'
6862

69-
test_expect_success \
70-
'--no-empty-directory hides empty directory' \
71-
'test_cmp expected3 output'
63+
test_expect_success '--no-empty-directory hides empty directory' '
64+
git ls-files --others --directory --no-empty-directory >output &&
65+
test_cmp expected3 output
66+
'
7267

7368
test_done

0 commit comments

Comments
 (0)