Merge pull request #2204 from ipfs/fix-test-str-contains

Fix test str contains

.gitignore

@@ -9,5 +9,4 @@
 *.orig
 *~
 
-/test/bin
-.ipfs
\ No newline at end of file
+.ipfs

test/bin/.gitignore

+# Ignore everything in this directory by default
+/**
+
+# Do not ignore this file itself
+!.gitignore
+
+# Do not ignore the following special scripts
+!checkflags
+!continueyn
+!ipfs-pin-stat
+!verify-go-fmt.sh

test/bin/ipfs-pin-stat

@@ -19,12 +19,12 @@ if [ "$?" -eq 0 ]; then
 fi
 
 ipfs pin ls --type=recursive | grep "$path" >/dev/null
-[ "$?" -eq 0 ] && echo "$path pinned recursively"
+[ "$?" -eq 0 ] && echo "$path pinned recursive-ly"
 
 ipfs pin ls --type=indirect | grep "$path" >/dev/null
-[ "$?" -eq 0 ] && echo "$path pinned indirectly"
+[ "$?" -eq 0 ] && echo "$path pinned indirect-ly"
 
 ipfs pin ls --type=direct | grep "$path" >/dev/null
-[ "$?" -eq 0 ] && echo "$path pinned directly"
+[ "$?" -eq 0 ] && echo "$path pinned direct-ly"
 
 exit 0

test/sharness/lib/test-lib.sh

@@ -321,7 +321,7 @@ test_should_contain() {
 test_str_contains() {
 	find=$1
 	shift
-	echo "$@" | grep "$find" >/dev/null
+	echo "$@" | grep "\b$find\b" >/dev/null
 }
 
 disk_usage() {

test/sharness/t0081-repo-pinning.sh

@@ -17,7 +17,7 @@ test_pin_flag() {
 
 	echo "test_pin_flag" $@
 
-	ipfs-pin-stat "$object" | grep "$ptype"
+	ipfs-pin-stat "$object" | egrep "\b$ptype\b"
 	actual=$?
 
 	if [ "$expect" = "true" ]; then