fix minor mfs truncate bug

whyrusleeping · whyrusleeping · commit 973707a884c3 · 2016-02-19T18:57:41.000-08:00
License: MIT
Signed-off-by: Jeromy &lt;jeromyj@gmail.com&gt;
diff --git a/mfs/dir.go b/mfs/dir.go
@@ -126,7 +126,7 @@ func (d *Directory) childNode(name string) (FSNode, error) {
 		ndir := NewDirectory(d.ctx, name, nd, d, d.dserv)
 		d.childDirs[name] = ndir
 		return ndir, nil
-	case ufspb.Data_File:
+	case ufspb.Data_File, ufspb.Data_Raw:
 		nfi, err := NewFile(name, nd, d, d.dserv)
 		if err != nil {
 			return nil, err
diff --git a/test/sharness/t0250-files-api.sh b/test/sharness/t0250-files-api.sh
@@ -358,6 +358,25 @@ test_files_api() {
 		verify_dir_contents /
 	'
 
+	# test truncating
+	test_expect_success "create a new file" '
+		echo "some content" | ipfs files write --create /cats
+	'
+
+	test_expect_success "truncate and write over that file" '
+		echo "fish" | ipfs files write --truncate /cats
+	'
+
+	test_expect_success "output looks good" '
+		ipfs files read /cats > file_out &&
+		echo "fish" > file_exp &&
+		test_cmp file_out file_exp
+	'
+
+	test_expect_success "cleanup" '
+		ipfs files rm /cats
+	'
+
 	# test flush flags
 	test_expect_success "mkdir --flush works" '
 		ipfs files mkdir --flush --parents /flushed/deep
diff --git a/unixfs/mod/dagmodifier.go b/unixfs/mod/dagmodifier.go
@@ -6,8 +6,8 @@ import (
 	"io"
 	"os"
 
-	proto "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/proto"
 	mh "gx/ipfs/QmYf7ng2hG5XBtJA3tN34DQ2GUN5HNksEw1rLDkmr6vGku/go-multihash"
+	proto "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/proto"
 	context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
 
 	key "github.com/ipfs/go-ipfs/blocks/key"
diff --git a/unixfs/mod/dagmodifier_test.go b/unixfs/mod/dagmodifier_test.go
@@ -447,6 +447,20 @@ func TestDagTruncate(t *testing.T) {
 	if size != 10 {
 		t.Fatal("size was incorrect!")
 	}
+
+	err = dagmod.Truncate(0)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	size, err = dagmod.Size()
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if size != 0 {
+		t.Fatal("size was incorrect!")
+	}
 }
 
 func TestSparseWrite(t *testing.T) {
