Merge pull request #3562 from ipfs/kevina/minor-cr-0.4.5

whyrusleeping · web-flow · commit d83a9112540a · 2017-01-05T07:18:12.000-08:00
Clean up minor issues in 0.4.5 cr.
diff --git a/test/sharness/t0040-add-and-cat.sh b/test/sharness/t0040-add-and-cat.sh
@@ -436,7 +436,7 @@ test_expect_success "ipfs add --only-hash succeeds" '
     echo "unknown content for only-hash" | ipfs add --only-hash -q > oh_hash
 '
 
-#TODO: this doesnt work when online hence separated out from test_add_cat_file
+#TODO: this doesn't work when online hence separated out from test_add_cat_file
 test_expect_success "ipfs cat file fails" '
     test_must_fail ipfs cat $(cat oh_hash)
 '
diff --git a/test/sharness/t0180-pubsub.sh b/test/sharness/t0180-pubsub.sh
@@ -54,7 +54,7 @@ test_expect_success "publish something" '
 test_expect_success "wait until echo > wait executed" '
 	cat wait &&
 	test_cmp pubErr empty &&
-	test_cmp expected actual 
+	test_cmp expected actual
 '
 
 test_expect_success 'stop iptb' '
diff --git a/unixfs/format_test.go b/unixfs/format_test.go
@@ -132,7 +132,7 @@ func TestPBdataTools(t *testing.T) {
 
 }
 
-func TestMetedata(t *testing.T) {
+func TestMetadata(t *testing.T) {
 	meta := &Metadata{
 		MimeType: "audio/aiff",
 		Size:     12345,

Original file line number	Diff line number	Diff line change
`@@ -436,7 +436,7 @@ test_expect_success "ipfs add --only-hash succeeds" '`
`436`	`436`	`echo "unknown content for only-hash" \| ipfs add --only-hash -q > oh_hash`
`437`	`437`	`'`
`438`	`438`
`439`		`-#TODO: this doesnt work when online hence separated out from test_add_cat_file`
	`439`	`+#TODO: this doesn't work when online hence separated out from test_add_cat_file`
`440`	`440`	`test_expect_success "ipfs cat file fails" '`
`441`	`441`	`test_must_fail ipfs cat $(cat oh_hash)`
`442`	`442`	`'`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ test_expect_success "publish something" '`
`54`	`54`	`test_expect_success "wait until echo > wait executed" '`
`55`	`55`	`cat wait &&`
`56`	`56`	`test_cmp pubErr empty &&`
`57`		`- test_cmp expected actual`
	`57`	`+ test_cmp expected actual`
`58`	`58`	`'`
`59`	`59`
`60`	`60`	`test_expect_success 'stop iptb' '`
Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ func TestPBdataTools(t *testing.T) {`
`132`	`132`
`133`	`133`	`}`
`134`	`134`
`135`		`-func TestMetedata(t *testing.T) {`
	`135`	`+func TestMetadata(t *testing.T) {`
`136`	`136`	`meta := &Metadata{`
`137`	`137`	`MimeType: "audio/aiff",`
`138`	`138`	`Size: 12345,`