aboutsummaryrefslogtreecommitdiffstats
path: root/swarm/storage/filestore_test.go
diff options
context:
space:
mode:
authorAnton Evangelatov <anton.evangelatov@gmail.com>2018-07-09 20:11:49 +0800
committerBalint Gabor <balint.g@gmail.com>2018-07-09 20:11:49 +0800
commitb3711af05176f446fad5ee90e2be4bd09c4086a2 (patch)
tree036eb23e423c385c0be00e3f8d3d97dea7040f8c /swarm/storage/filestore_test.go
parent30bdf817a0d0afb33f3635f1de877f9caf09be05 (diff)
downloadgo-tangerine-b3711af05176f446fad5ee90e2be4bd09c4086a2.tar
go-tangerine-b3711af05176f446fad5ee90e2be4bd09c4086a2.tar.gz
go-tangerine-b3711af05176f446fad5ee90e2be4bd09c4086a2.tar.bz2
go-tangerine-b3711af05176f446fad5ee90e2be4bd09c4086a2.tar.lz
go-tangerine-b3711af05176f446fad5ee90e2be4bd09c4086a2.tar.xz
go-tangerine-b3711af05176f446fad5ee90e2be4bd09c4086a2.tar.zst
go-tangerine-b3711af05176f446fad5ee90e2be4bd09c4086a2.zip
swarm: ctx propagation; bmt fixes; pss generic notification framework (#17150)
* cmd/swarm: minor cli flag text adjustments * swarm/api/http: sticky footer for swarm landing page using flex * swarm/api/http: sticky footer for error pages and fix for multiple choices * cmd/swarm, swarm/storage, swarm: fix mingw on windows test issues * cmd/swarm: update description of swarm cmd * swarm: added network ID test * cmd/swarm: support for smoke tests on the production swarm cluster * cmd/swarm/swarm-smoke: simplify cluster logic as per suggestion * swarm: propagate ctx to internal apis (#754) * swarm/metrics: collect disk measurements * swarm/bmt: fix io.Writer interface * Write now tolerates arbitrary variable buffers * added variable buffer tests * Write loop and finalise optimisation * refactor / rename * add tests for empty input * swarm/pss: (UPDATE) Generic notifications package (#744) swarm/pss: Generic package for creating pss notification svcs * swarm: Adding context to more functions * swarm/api: change colour of landing page in templates * swarm/api: change landing page to react to enter keypress
Diffstat (limited to 'swarm/storage/filestore_test.go')
-rw-r--r--swarm/storage/filestore_test.go27
1 files changed, 18 insertions, 9 deletions
diff --git a/swarm/storage/filestore_test.go b/swarm/storage/filestore_test.go
index 1aaec5e5c..f3f597255 100644
--- a/swarm/storage/filestore_test.go
+++ b/swarm/storage/filestore_test.go
@@ -18,6 +18,7 @@ package storage
import (
"bytes"
+ "context"
"io"
"io/ioutil"
"os"
@@ -49,12 +50,16 @@ func testFileStoreRandom(toEncrypt bool, t *testing.T) {
defer os.RemoveAll("/tmp/bzz")
reader, slice := generateRandomData(testDataSize)
- key, wait, err := fileStore.Store(reader, testDataSize, toEncrypt)
+ ctx := context.TODO()
+ key, wait, err := fileStore.Store(ctx, reader, testDataSize, toEncrypt)
if err != nil {
t.Errorf("Store error: %v", err)
}
- wait()
- resultReader, isEncrypted := fileStore.Retrieve(key)
+ err = wait(ctx)
+ if err != nil {
+ t.Fatalf("Store waitt error: %v", err.Error())
+ }
+ resultReader, isEncrypted := fileStore.Retrieve(context.TODO(), key)
if isEncrypted != toEncrypt {
t.Fatalf("isEncrypted expected %v got %v", toEncrypt, isEncrypted)
}
@@ -72,7 +77,7 @@ func testFileStoreRandom(toEncrypt bool, t *testing.T) {
ioutil.WriteFile("/tmp/slice.bzz.16M", slice, 0666)
ioutil.WriteFile("/tmp/result.bzz.16M", resultSlice, 0666)
localStore.memStore = NewMemStore(NewDefaultStoreParams(), db)
- resultReader, isEncrypted = fileStore.Retrieve(key)
+ resultReader, isEncrypted = fileStore.Retrieve(context.TODO(), key)
if isEncrypted != toEncrypt {
t.Fatalf("isEncrypted expected %v got %v", toEncrypt, isEncrypted)
}
@@ -110,12 +115,16 @@ func testFileStoreCapacity(toEncrypt bool, t *testing.T) {
}
fileStore := NewFileStore(localStore, NewFileStoreParams())
reader, slice := generateRandomData(testDataSize)
- key, wait, err := fileStore.Store(reader, testDataSize, toEncrypt)
+ ctx := context.TODO()
+ key, wait, err := fileStore.Store(ctx, reader, testDataSize, toEncrypt)
+ if err != nil {
+ t.Errorf("Store error: %v", err)
+ }
+ err = wait(ctx)
if err != nil {
t.Errorf("Store error: %v", err)
}
- wait()
- resultReader, isEncrypted := fileStore.Retrieve(key)
+ resultReader, isEncrypted := fileStore.Retrieve(context.TODO(), key)
if isEncrypted != toEncrypt {
t.Fatalf("isEncrypted expected %v got %v", toEncrypt, isEncrypted)
}
@@ -134,7 +143,7 @@ func testFileStoreCapacity(toEncrypt bool, t *testing.T) {
memStore.setCapacity(0)
// check whether it is, indeed, empty
fileStore.ChunkStore = memStore
- resultReader, isEncrypted = fileStore.Retrieve(key)
+ resultReader, isEncrypted = fileStore.Retrieve(context.TODO(), key)
if isEncrypted != toEncrypt {
t.Fatalf("isEncrypted expected %v got %v", toEncrypt, isEncrypted)
}
@@ -144,7 +153,7 @@ func testFileStoreCapacity(toEncrypt bool, t *testing.T) {
// check how it works with localStore
fileStore.ChunkStore = localStore
// localStore.dbStore.setCapacity(0)
- resultReader, isEncrypted = fileStore.Retrieve(key)
+ resultReader, isEncrypted = fileStore.Retrieve(context.TODO(), key)
if isEncrypted != toEncrypt {
t.Fatalf("isEncrypted expected %v got %v", toEncrypt, isEncrypted)
}