fixify tests
License: MIT Signed-off-by: Jeromy <jeromyj@gmail.com>
Jeromy committed
Dec 4, 2015 at 21:09 UTC
be09205310f393a50912529f4324b72462ed4132
5 files changed
+21
-12
core/coreunix/add.go
+2
-2
@@ -280,16 +280,16 @@ func AddR(n *core.IpfsNode, root string) (key string, err error) {
280
// the directory, and and error if any.
281
func AddWrapped(n *core.IpfsNode, r io.Reader, filename string) (string, *dag.Node, error) {
282
file := files.NewReaderFile(filename, filename, ioutil.NopCloser(r), nil)
283
- dir := files.NewSliceFile("", "", []files.File{file})
283
fileAdder, err := NewAdder(n.Context(), n, nil)
284
if err != nil {
285
return "", nil, err
286
}
287
+ fileAdder.Wrap = true
288
289
unlock := n.Blockstore.PinLock()
290
defer unlock()
291
292
- err = fileAdder.addDir(dir)
292
+ err = fileAdder.AddFile(file)
293
if err != nil {
294
return "", nil, err
295
}
core/coreunix/add_test.go
+2
-8
@@ -1,8 +1,6 @@
1
package coreunix
2
3
import (
4
- "os"
5
- "path"
4
"testing"
5
6
"github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
@@ -13,10 +11,6 @@ import (
11
)
12
13
func TestAddRecursive(t *testing.T) {
16
- here, err := os.Getwd()
17
- if err != nil {
18
- t.Fatal(err)
19
- }
14
r := &repo.Mock{
15
C: config.Config{
16
Identity: config.Identity{
@@ -29,9 +23,9 @@ func TestAddRecursive(t *testing.T) {
23
if err != nil {
24
t.Fatal(err)
25
}
32
- if k, err := AddR(node, path.Join(here, "test_data")); err != nil {
26
+ if k, err := AddR(node, "test_data"); err != nil {
27
t.Fatal(err)
28
} else if k != "QmWCCga8AbTyfAQ7pTnGT6JgmRMAB3Qp8ZmTEFi5q5o8jC" {
35
- t.Fatal("keys do not match")
29
+ t.Fatal("keys do not match: ", k)
30
}
31
}
mfs/ops.go
+3
@@ -101,6 +101,9 @@ func PutNode(r *Root, path string, nd *dag.Node) error {
101
// Mkdir creates a directory at 'path' under the directory 'd', creating
102
// intermediary directories as needed if 'parents' is set to true
103
func Mkdir(r *Root, pth string, parents bool) error {
104
+ if pth == "" {
105
+ panic("empty path")
106
+ }
107
parts := path.SplitList(pth)
108
if parts[0] == "" {
109
parts = parts[1:]
mfs/system.go
+12
@@ -124,9 +124,21 @@ func (kr *Root) closeChild(name string, nd *dag.Node) error {
124
}
125
126
func (kr *Root) Close() error {
127
+ nd, err := kr.GetValue().GetNode()
128
+ if err != nil {
129
+ return err
130
+ }
131
+
132
+ k, err := kr.dserv.Add(nd)
133
+ if err != nil {
134
+ return err
135
+ }
136
+
137
if kr.repub != nil {
138
+ kr.repub.Update(k)
139
return kr.repub.Close()
140
}
141
+
142
return nil
143
}
144
test/sharness/t0200-unixfs-ls.sh
+2
-2
@@ -27,12 +27,12 @@ test_ls_cmd() {
27
cat <<-\EOF >expected_add &&
28
added QmQNd6ubRXaNG6Prov8o6vk3bn6eWsj9FxLGrAVDUAGkGe testData/d1/128
29
added QmZULkCELmmk5XNfCgTnCyFgAVxBRBXyDHGGMVoLFLiXEN testData/d1/a
30
- added QmSix55yz8CzWXf5ZVM9vgEvijnEeeXiTSarVtsqiiCJss testData/d1
30
added QmbQBUSRL9raZtNXfpTDeaxQapibJEG6qEY8WqAN22aUzd testData/d2/1024
31
added QmaRGe7bVmVaLmxbrMiVNXqW4pRNNp3xq7hFtyRKA3mtJL testData/d2/a
33
- added QmR3jhV4XpxxPjPT3Y8vNnWvWNvakdcT3H6vqpRBsX1MLy testData/d2
32
added QmeomffUNfmQy76CQGy9NdmqEnnHU9soCexBnGU3ezPHVH testData/f1
33
added QmNtocSs7MoDkJMc1RkyisCSKvLadujPsfJfSdJ3e1eA1M testData/f2
34
+ added QmSix55yz8CzWXf5ZVM9vgEvijnEeeXiTSarVtsqiiCJss testData/d1
35
+ added QmR3jhV4XpxxPjPT3Y8vNnWvWNvakdcT3H6vqpRBsX1MLy testData/d2
36
added QmfNy183bXiRVyrhyWtq3TwHn79yHEkiAGFr18P7YNzESj testData
37
EOF
38
test_cmp expected_add actual_add