cascade/ipfs-cluster
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

files2.0: fix ContextCancelled test

Browse Source 
License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>
This commit is contained in:
Łukasz Magiera 2018-12-03 11:30:31 +01:00 committed by Hector Sanjuan
parent 00df384e1c
commit d0678aad6e
2 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
adder/adder_test.go
View File

@ -11,6 +11,7 @@ import (
"github.com/ipfs/ipfs-cluster/test"
cid "github.com/ipfs/go-cid"
files "github.com/ipfs/go-ipfs-files"
ipld "github.com/ipfs/go-ipld-format"
)
@ -105,8 +106,20 @@ func TestAdder_ContextCancelled(t *testing.T) {
sth := test.NewShardingTestHelper()
defer sth.Clean(t)
mr, closer := sth.GetRandFileMultiReader(t, 50000) // 50 MB
lg, closer := sth.GetRandFileReader(t, 50000) // 50 MB
st := sth.GetTreeSerialFile(t)
defer closer.Close()
defer st.Close()
slf := files.NewSliceFile([]files.DirEntry{
files.FileEntry("a", lg),
files.FileEntry("b", st),
})
mr, err := files.NewMultiFileReader(slf, true)
if err != nil {
t.Fatal(err)
}
r := multipart.NewReader(mr, mr.Boundary())
p := api.DefaultAddParams()

15
test/sharding.go
View File

@ -121,17 +121,22 @@ func (sth *ShardingTestHelper) GetTreeSerialFile(t *testing.T) files.Directory {
// a testing random file of the given size (in kbs). The random
// file is different every time.
func (sth *ShardingTestHelper) GetRandFileMultiReader(t *testing.T, kbs int) (*files.MultiFileReader, io.Closer) {
slf, sf := sth.GetRandFileReader(t, kbs)
mfr, err := files.NewMultiFileReader(slf, true)
if err != nil {
t.Fatal(err)
}
return mfr, sf
}
func (sth *ShardingTestHelper) GetRandFileReader(t *testing.T, kbs int) (files.Directory, io.Closer) {
st := sth.makeRandFile(t, kbs)
sf, err := files.NewSerialFile(sth.path(shardingTestFile), false, st)
if err != nil {
t.Fatal(err)
}
slf := files.NewSliceFile([]files.DirEntry{files.FileEntry("randomfile", sf)})
mfr, err := files.NewMultiFileReader(slf, true)
if err != nil {
t.Fatal(err)
}
return mfr, sf
return slf, sf
}
// Clean deletes any folder and file generated by this helper.