t0045: style cleanup and add missing &&
This makes the following changes: - remove some superfluous \ at the end of some lines - use `cat <<-\EOF >expected` to ignore the starting tabs in the here document - add missing && after some `cat` - use test_cmp to compare files License: MIT Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Christian Couder committed
Mar 7, 2015 at 20:26 UTC
e1a33a0e92cf55d2d7a9bff2e6eaf18c126fa831
1 file changed
+38
-38
test/sharness/t0045-ls.sh
+38
-38
@@ -11,56 +11,56 @@ test_description="Test ls command"
11
test_init_ipfs
12
13
test_expect_success "'ipfs add -r testData' succeeds" '
14
- mkdir testData testData/d1 testData/d2 && \
15
- echo "test" > testData/f1 && \
16
- echo "data" > testData/f2 && \
17
- echo "hello" > testData/d1/a && \
18
- random 128 42 > testData/d1/128 && \
19
- echo "world" > testData/d2/a && \
20
- random 1024 42 > testData/d2/1024 && \
21
- ipfs add -r testData > actual_add
14
+ mkdir testData testData/d1 testData/d2 &&
15
+ echo "test" >testData/f1 &&
16
+ echo "data" >testData/f2 &&
17
+ echo "hello" >testData/d1/a &&
18
+ random 128 42 >testData/d1/128 &&
19
+ echo "world" >testData/d2/a &&
20
+ random 1024 42 >testData/d2/1024 &&
21
+ ipfs add -r testData >actual_add
22
'
23
24
test_expect_success "'ipfs add' output looks good" '
25
- cat << EOF > expected_add
26
-added QmQNd6ubRXaNG6Prov8o6vk3bn6eWsj9FxLGrAVDUAGkGe testData/d1/128
27
-added QmZULkCELmmk5XNfCgTnCyFgAVxBRBXyDHGGMVoLFLiXEN testData/d1/a
28
-added QmSix55yz8CzWXf5ZVM9vgEvijnEeeXiTSarVtsqiiCJss testData/d1
29
-added QmbQBUSRL9raZtNXfpTDeaxQapibJEG6qEY8WqAN22aUzd testData/d2/1024
30
-added QmaRGe7bVmVaLmxbrMiVNXqW4pRNNp3xq7hFtyRKA3mtJL testData/d2/a
31
-added QmR3jhV4XpxxPjPT3Y8vNnWvWNvakdcT3H6vqpRBsX1MLy testData/d2
32
-added QmeomffUNfmQy76CQGy9NdmqEnnHU9soCexBnGU3ezPHVH testData/f1
33
-added QmNtocSs7MoDkJMc1RkyisCSKvLadujPsfJfSdJ3e1eA1M testData/f2
34
-added QmfNy183bXiRVyrhyWtq3TwHn79yHEkiAGFr18P7YNzESj testData
35
-EOF
36
- test $(diff actual_add expected_add | wc -l) -eq 0
25
+ cat <<-\EOF >expected_add &&
26
+ added QmQNd6ubRXaNG6Prov8o6vk3bn6eWsj9FxLGrAVDUAGkGe testData/d1/128
27
+ added QmZULkCELmmk5XNfCgTnCyFgAVxBRBXyDHGGMVoLFLiXEN testData/d1/a
28
+ added QmSix55yz8CzWXf5ZVM9vgEvijnEeeXiTSarVtsqiiCJss testData/d1
29
+ added QmbQBUSRL9raZtNXfpTDeaxQapibJEG6qEY8WqAN22aUzd testData/d2/1024
30
+ added QmaRGe7bVmVaLmxbrMiVNXqW4pRNNp3xq7hFtyRKA3mtJL testData/d2/a
31
+ added QmR3jhV4XpxxPjPT3Y8vNnWvWNvakdcT3H6vqpRBsX1MLy testData/d2
32
+ added QmeomffUNfmQy76CQGy9NdmqEnnHU9soCexBnGU3ezPHVH testData/f1
33
+ added QmNtocSs7MoDkJMc1RkyisCSKvLadujPsfJfSdJ3e1eA1M testData/f2
34
+ added QmfNy183bXiRVyrhyWtq3TwHn79yHEkiAGFr18P7YNzESj testData
35
+ EOF
36
+ test_cmp expected_add actual_add
37
'
38
39
test_expect_success "'ipfs ls <three dir hashes>' succeeds" '
40
- ipfs ls QmfNy183bXiRVyrhyWtq3TwHn79yHEkiAGFr18P7YNzESj QmR3jhV4XpxxPjPT3Y8vNnWvWNvakdcT3H6vqpRBsX1MLy QmSix55yz8CzWXf5ZVM9vgEvijnEeeXiTSarVtsqiiCJss > actual_ls
40
+ ipfs ls QmfNy183bXiRVyrhyWtq3TwHn79yHEkiAGFr18P7YNzESj QmR3jhV4XpxxPjPT3Y8vNnWvWNvakdcT3H6vqpRBsX1MLy QmSix55yz8CzWXf5ZVM9vgEvijnEeeXiTSarVtsqiiCJss >actual_ls
41
'
42
43
test_expect_success "'ipfs ls <three dir hashes>' output looks good" '
44
- cat << EOF > expected_ls
45
-QmfNy183bXiRVyrhyWtq3TwHn79yHEkiAGFr18P7YNzESj:
46
-Hash Size Name
47
-QmSix55yz8CzWXf5ZVM9vgEvijnEeeXiTSarVtsqiiCJss 246 d1/
48
-QmR3jhV4XpxxPjPT3Y8vNnWvWNvakdcT3H6vqpRBsX1MLy 1143 d2/
49
-QmeomffUNfmQy76CQGy9NdmqEnnHU9soCexBnGU3ezPHVH 13 f1
50
-QmNtocSs7MoDkJMc1RkyisCSKvLadujPsfJfSdJ3e1eA1M 13 f2
44
+ cat <<-\EOF >expected_ls &&
45
+ QmfNy183bXiRVyrhyWtq3TwHn79yHEkiAGFr18P7YNzESj:
46
+ Hash Size Name
47
+ QmSix55yz8CzWXf5ZVM9vgEvijnEeeXiTSarVtsqiiCJss 246 d1/
48
+ QmR3jhV4XpxxPjPT3Y8vNnWvWNvakdcT3H6vqpRBsX1MLy 1143 d2/
49
+ QmeomffUNfmQy76CQGy9NdmqEnnHU9soCexBnGU3ezPHVH 13 f1
50
+ QmNtocSs7MoDkJMc1RkyisCSKvLadujPsfJfSdJ3e1eA1M 13 f2
51
52
-QmR3jhV4XpxxPjPT3Y8vNnWvWNvakdcT3H6vqpRBsX1MLy:
53
-Hash Size Name
54
-QmbQBUSRL9raZtNXfpTDeaxQapibJEG6qEY8WqAN22aUzd 1035 1024
55
-QmaRGe7bVmVaLmxbrMiVNXqW4pRNNp3xq7hFtyRKA3mtJL 14 a
52
+ QmR3jhV4XpxxPjPT3Y8vNnWvWNvakdcT3H6vqpRBsX1MLy:
53
+ Hash Size Name
54
+ QmbQBUSRL9raZtNXfpTDeaxQapibJEG6qEY8WqAN22aUzd 1035 1024
55
+ QmaRGe7bVmVaLmxbrMiVNXqW4pRNNp3xq7hFtyRKA3mtJL 14 a
56
57
-QmSix55yz8CzWXf5ZVM9vgEvijnEeeXiTSarVtsqiiCJss:
58
-Hash Size Name
59
-QmQNd6ubRXaNG6Prov8o6vk3bn6eWsj9FxLGrAVDUAGkGe 139 128
60
-QmZULkCELmmk5XNfCgTnCyFgAVxBRBXyDHGGMVoLFLiXEN 14 a
57
+ QmSix55yz8CzWXf5ZVM9vgEvijnEeeXiTSarVtsqiiCJss:
58
+ Hash Size Name
59
+ QmQNd6ubRXaNG6Prov8o6vk3bn6eWsj9FxLGrAVDUAGkGe 139 128
60
+ QmZULkCELmmk5XNfCgTnCyFgAVxBRBXyDHGGMVoLFLiXEN 14 a
61
62
-EOF
63
- test $(diff actual_ls expected_ls | wc -l) -eq 0
62
+ EOF
63
+ test_cmp expected_ls actual_ls
64
'
65
66
test_done