From 6da92a1f0a6a3dcac69b4ade11ea6c4214d40778 Mon Sep 17 00:00:00 2001 From: camelmasa Date: Wed, 4 Apr 2018 19:39:02 +0900 Subject: [PATCH] Fix wrong added filename License: MIT Signed-off-by: Masahiro Saito --- core/coreunix/add.go | 3 ++- core/coreunix/add_test.go | 2 +- core/coreunix/{test_data => test/data}/colors/orange | 0 core/coreunix/{test_data => test/data}/corps/apple | 0 core/coreunix/{test_data => test/data}/fruits/apple | 0 core/coreunix/{test_data => test/data}/fruits/orange | 0 6 files changed, 3 insertions(+), 2 deletions(-) rename core/coreunix/{test_data => test/data}/colors/orange (100%) rename core/coreunix/{test_data => test/data}/corps/apple (100%) rename core/coreunix/{test_data => test/data}/fruits/apple (100%) rename core/coreunix/{test_data => test/data}/fruits/orange (100%) diff --git a/core/coreunix/add.go b/core/coreunix/add.go index 198eea7ebe6..88cd9e4a764 100644 --- a/core/coreunix/add.go +++ b/core/coreunix/add.go @@ -7,6 +7,7 @@ import ( "io/ioutil" "os" gopath "path" + "path/filepath" "strconv" core "github.com/ipfs/go-ipfs/core" @@ -316,7 +317,7 @@ func AddR(n *core.IpfsNode, root string) (key string, err error) { return "", err } - f, err := files.NewSerialFile(root, root, false, stat) + f, err := files.NewSerialFile(filepath.Base(root), root, false, stat) if err != nil { return "", err } diff --git a/core/coreunix/add_test.go b/core/coreunix/add_test.go index 6c06bed7f01..791289e2f39 100644 --- a/core/coreunix/add_test.go +++ b/core/coreunix/add_test.go @@ -41,7 +41,7 @@ func TestAddRecursive(t *testing.T) { if err != nil { t.Fatal(err) } - if k, err := AddR(node, "test_data"); err != nil { + if k, err := AddR(node, "test/data"); err != nil { t.Fatal(err) } else if k != "QmWCCga8AbTyfAQ7pTnGT6JgmRMAB3Qp8ZmTEFi5q5o8jC" { t.Fatal("keys do not match: ", k) diff --git a/core/coreunix/test_data/colors/orange b/core/coreunix/test/data/colors/orange similarity index 100% rename from core/coreunix/test_data/colors/orange rename to core/coreunix/test/data/colors/orange diff --git a/core/coreunix/test_data/corps/apple b/core/coreunix/test/data/corps/apple similarity index 100% rename from core/coreunix/test_data/corps/apple rename to core/coreunix/test/data/corps/apple diff --git a/core/coreunix/test_data/fruits/apple b/core/coreunix/test/data/fruits/apple similarity index 100% rename from core/coreunix/test_data/fruits/apple rename to core/coreunix/test/data/fruits/apple diff --git a/core/coreunix/test_data/fruits/orange b/core/coreunix/test/data/fruits/orange similarity index 100% rename from core/coreunix/test_data/fruits/orange rename to core/coreunix/test/data/fruits/orange