sharness: Follow the calling convention expected, actual

tv42 · tv42 · commit 676ae6a7c9ab · 2015-05-13T07:29:08.000-07:00
diff --git a/test/ipfs-test-lib.sh b/test/ipfs-test-lib.sh
@@ -23,10 +23,24 @@ test_sort_cmp() {
 	test_cmp "$1_sorted" "$2_sorted"
 }
 
-# Similar to test_sort_cmp, but file A must have all lines of B, can have extra
+# Test whether all the expected lines are included in a file. The file
+# can have extra lines.
+#
+# $1 - Path to file with expected lines.
+# $2 - Path to file with actual output.
+#
+# Examples
+#
+#   test_expect_success 'foo says hello' '
+#       echo hello >expected &&
+#       foo >actual &&
+#       test_cmp expected actual
+#   '
+#
+# Returns the exit code of the command set by TEST_CMP.
 test_includes_lines() {
 	sort "$1" >"$1_sorted" &&
 	sort "$2" >"$2_sorted" &&
-	comm -1 -3 "$1_sorted" "$2_sorted" >"$1_missing" &&
-	[ ! -s "$1_missing" ] || test_fsh comm -1 -3 "$1_sorted" "$2_sorted"
+	comm -2 -3 "$1_sorted" "$2_sorted" >"$2_missing" &&
+	[ ! -s "$2_missing" ] || test_fsh comm -2 -3 "$1_sorted" "$2_sorted"
 }
diff --git a/test/sharness/t0080-repo.sh b/test/sharness/t0080-repo.sh
@@ -80,7 +80,7 @@ test_expect_success "remove direct pin" '
 test_expect_success "'ipfs repo gc' removes file" '
 	ipfs repo gc >actual7 &&
 	echo "removed $HASH" >expected7 &&
-	test_includes_lines actual7 expected7
+	test_includes_lines expected7 actual7
 '
 
 # TODO: there seems to be a serious bug with leveldb not returning a key.
diff --git a/test/sharness/t0081-repo-pinning.sh b/test/sharness/t0081-repo-pinning.sh
@@ -214,7 +214,7 @@ test_expect_success "'ipfs repo gc' succeeds" '
 	echo "removed $HASH_FILE3" > gc_out_exp2 &&
 	echo "removed $HASH_FILE5" >> gc_out_exp2 &&
 	echo "removed $HASH_DIR3" >> gc_out_exp2 &&
-	test_includes_lines gc_out_actual2 gc_out_exp2
+	test_includes_lines gc_out_exp2 gc_out_actual2
 '
 
 # use object links for HASH_DIR1 here because its children

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ test_expect_success "remove direct pin" '`
`80`	`80`	`test_expect_success "'ipfs repo gc' removes file" '`
`81`	`81`	`ipfs repo gc >actual7 &&`
`82`	`82`	`echo "removed $HASH" >expected7 &&`
`83`		`- test_includes_lines actual7 expected7`
	`83`	`+ test_includes_lines expected7 actual7`
`84`	`84`	`'`
`85`	`85`
`86`	`86`	`# TODO: there seems to be a serious bug with leveldb not returning a key.`
Original file line number	Diff line number	Diff line change
`@@ -214,7 +214,7 @@ test_expect_success "'ipfs repo gc' succeeds" '`
`214`	`214`	`echo "removed $HASH_FILE3" > gc_out_exp2 &&`
`215`	`215`	`echo "removed $HASH_FILE5" >> gc_out_exp2 &&`
`216`	`216`	`echo "removed $HASH_DIR3" >> gc_out_exp2 &&`
`217`		`- test_includes_lines gc_out_actual2 gc_out_exp2`
	`217`	`+ test_includes_lines gc_out_exp2 gc_out_actual2`
`218`	`218`	`'`
`219`	`219`
`220`	`220`	`# use object links for HASH_DIR1 here because its children`