Merge pull request #1293 from rht/cleanup-cat-error

Add test for cat error message when `ipfs init` hasn't been run
ipfs · May 30, 2015 · ee10b41 · ee10b41
2 parents 6f15523 + f5d5095
commit ee10b41
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/repo/fsrepo/fsrepo.go b/repo/fsrepo/fsrepo.go
@@ -52,7 +52,7 @@ type NoRepoError struct {
 var _ error = NoRepoError{}
 
 func (err NoRepoError) Error() string {
-	return fmt.Sprintf("no ipfs repo found in '%s'. please run: ipfs init ", err.Path)
+	return fmt.Sprintf("no ipfs repo found in %s.\nplease run: ipfs init", err.Path)
 }
 
 const (

diff --git a/test/sharness/t0020-init.sh b/test/sharness/t0020-init.sh
@@ -21,9 +21,23 @@ test_expect_success "ipfs init fails" '
 
 test_expect_success "ipfs init output looks good" '
 	echo "Error: failed to take lock at $IPFS_PATH: permission denied" > init_fail_exp &&
-	test_cmp init_fail_out init_fail_exp
+	test_cmp init_fail_exp init_fail_out
 '
 
+# test no repo error message
+# this applies to `ipfs add sth`, `ipfs refs <hash>`
+test_expect_success "ipfs cat fails" '
+    export IPFS_PATH="$(pwd)/.ipfs" &&
+    test_must_fail ipfs cat Qmaa4Rw81a3a1VEx4LxB7HADUAXvZFhCoRdBzsMZyZmqHD 2> cat_fail_out
+'
+
+test_expect_success "ipfs cat no repo message looks good" '
+    echo "Error: no ipfs repo found in $IPFS_PATH." > cat_fail_exp &&
+    echo "please run: ipfs init" >> cat_fail_exp &&
+    test_cmp cat_fail_exp cat_fail_out
+'
+
+# test that init succeeds
 test_expect_success "ipfs init succeeds" '
 	export IPFS_PATH="$(pwd)/.ipfs" &&
 	BITS="2048" &&