Merge pull request #1781 from ipfs/improve-t0240

jbenet · jbenet · commit 47a353de6a14 · 2015-10-03T18:00:22.000-04:00
Improve t0240
diff --git a/test/sharness/t0240-republisher.sh b/test/sharness/t0240-republisher.sh
@@ -12,7 +12,9 @@ export IPTB_ROOT="`pwd`/.iptb"
 export DEBUG=true
 
 ipfsi() {
-	local dir=$1; shift; IPFS_PATH="$IPTB_ROOT/$dir" ipfs $@
+	dir="$1"
+	shift
+	IPFS_PATH="$IPTB_ROOT/$dir" ipfs "$@"
 }
 
 setup_iptb() {
@@ -21,7 +23,7 @@ setup_iptb() {
 	'
 
 	test_expect_success "set configs up" '
-		for i in `seq 0 3`
+		for i in $(test_seq 0 3)
 		do
 			ipfsi $i config Ipns.RepublishPeriod 20s
 		done
@@ -61,8 +63,8 @@ verify_can_resolve() {
 	'
 
 	test_expect_success "output looks right" '
-		printf /ipfs/$expected > expected &&
-		test_cmp resolve expected
+		printf "/ipfs/$expected" > expected &&
+		test_cmp expected resolve
 	'
 }
 

Original file line number	Diff line number	Diff line change
@@ -12,7 +12,9 @@ export IPTB_ROOT="`pwd`/.iptb"
`12`	`12`	`export DEBUG=true`
`13`	`13`
`14`	`14`	`ipfsi() {`
`15`		`- local dir=$1; shift; IPFS_PATH="$IPTB_ROOT/$dir" ipfs $@`
	`15`	`+ dir="$1"`
	`16`	`+ shift`
	`17`	`+ IPFS_PATH="$IPTB_ROOT/$dir" ipfs "$@"`
`16`	`18`	`}`
`17`	`19`
`18`	`20`	`setup_iptb() {`
`@@ -21,7 +23,7 @@ setup_iptb() {`
`21`	`23`	`'`
`22`	`24`
`23`	`25`	`test_expect_success "set configs up" '`
`24`		- for i in `seq 0 3`
	`26`	`+ for i in $(test_seq 0 3)`
`25`	`27`	`do`
`26`	`28`	`ipfsi $i config Ipns.RepublishPeriod 20s`
`27`	`29`	`done`
`@@ -61,8 +63,8 @@ verify_can_resolve() {`
`61`	`63`	`'`
`62`	`64`
`63`	`65`	`test_expect_success "output looks right" '`
`64`		`- printf /ipfs/$expected > expected &&`
`65`		`- test_cmp resolve expected`
	`66`	`+ printf "/ipfs/$expected" > expected &&`
	`67`	`+ test_cmp expected resolve`
`66`	`68`	`'`
`67`	`69`	`}`
`68`	`70`