Remove couple linux-isms: these are not valid on macos
Some did actually prevent proper test shutdown
Peter Rabbitson committed
Dec 14, 2019 at 15:24 UTC
52476c026c4b641c06bab4a115f46965636e0109
3 files changed
+7
-7
test/sharness/t0080-repo.sh
+2
-2
@@ -247,10 +247,10 @@ test_expect_success "'ipfs repo stat --human' succeeds" '
247
248
test_expect_success "repo stats --human came out correct" '
249
grep "RepoPath" repo-stats-human &&
250
- grep -P "RepoSize:\s*([0-9]*[.])?[0-9]+\s+?(B|kB|MB|GB|TB|PB|EB)" repo-stats-human &&
250
+ grep -E "RepoSize:\s*([0-9]*[.])?[0-9]+\s+?(B|kB|MB|GB|TB|PB|EB)" repo-stats-human &&
251
grep "NumObjects" repo-stats-human &&
252
grep "Version" repo-stats-human &&
253
- grep -P "StorageMax:\s*([0-9]*[.])?[0-9]+\s+?(B|kB|MB|GB|TB|PB|EB)" repo-stats-human ||
253
+ grep -E "StorageMax:\s*([0-9]*[.])?[0-9]+\s+?(B|kB|MB|GB|TB|PB|EB)" repo-stats-human ||
254
test_fsh cat repo-stats-human
255
'
256
test/sharness/t0180-p2p.sh
+4
-4
@@ -22,10 +22,10 @@ test_expect_success 'peer ids' '
22
'
23
check_test_ports() {
24
test_expect_success "test ports are closed" '
25
- (! (netstat -lnp | grep "LISTEN" | grep ":10101 ")) &&
26
- (! (netstat -lnp | grep "LISTEN" | grep ":10102 "))&&
27
- (! (netstat -lnp | grep "LISTEN" | grep ":10103 ")) &&
28
- (! (netstat -lnp | grep "LISTEN" | grep ":10104 "))
25
+ (! (netstat -aln | grep "LISTEN" | grep -E "[.:]10101 ")) &&
26
+ (! (netstat -aln | grep "LISTEN" | grep -E "[.:]10102 ")) &&
27
+ (! (netstat -aln | grep "LISTEN" | grep -E "[.:]10103 ")) &&
28
+ (! (netstat -aln | grep "LISTEN" | grep -E "[.:]10104 "))
29
'
30
}
31
check_test_ports
test/sharness/t0280-plugin-git.sh
+1
-1
@@ -21,7 +21,7 @@ test_dag_git() {
21
'
22
23
test_expect_success "successfully get added objects" '
24
- cat hashes | xargs -i ipfs dag get -- {} > /dev/null
24
+ cat hashes | xargs -I {} ipfs dag get -- {} > /dev/null
25
'
26
27
test_expect_success "path traversals work" '