mirror of https://github.com/ethereum/go-ethereum
fixes #3444 fixes #3494 networkid override Added comments to explain why test against 0 appears twice * Command line overrides saved config, saved config overrides system default --- fixes #3476 bzzr get with path Finally a hopefully clean commit for this PR Added check for empty path to avoid SIGSEGV in path parser and resolver Added requested tests for empty path and non-existing manifest. However signature for StartHTTPServer had changed. Now it's hacked as so: StartHttpServer(api.API, &Server{Addr: "127.0.0.1:8504", CorsString: ""}) * Parse url before resolve when path and ENS is supplied, example * swarm/api/http proxy server test for retrieval of subpath through get * Removed nil entry assignment on subtrie leaf in recursive key retrieval * Cleaned up path-or-no-path condition in proxy server get handler * swarm: processed with gofmt refers to lash/go-ethereum@90daa7a * swarm: Added public access method Parse alias to parse * swarm: processed with gofmt References nolash/go-ethereum@2ec3fd7 * Rename parse to Parse, removed aliaspull/3615/head
nolash
8 years ago
parent
82aa5b1de6
commit
7669c5b5ec
@ -0,0 +1,117 @@ |
||||
package http |
||||
|
||||
import ( |
||||
"bytes" |
||||
"io/ioutil" |
||||
"net/http" |
||||
"sync" |
||||
"testing" |
||||
"time" |
||||
|
||||
"github.com/ethereum/go-ethereum/common" |
||||
"github.com/ethereum/go-ethereum/swarm/api" |
||||
"github.com/ethereum/go-ethereum/swarm/storage" |
||||
) |
||||
|
||||
func TestBzzrGetPath(t *testing.T) { |
||||
|
||||
var err error |
||||
|
||||
maxproxyattempts := 3 |
||||
|
||||
testmanifest := []string{ |
||||
`{"entries":[{"path":"a/","hash":"674af7073604ebfc0282a4ab21e5ef1a3c22913866879ebc0816f8a89896b2ed","contentType":"application/bzz-manifest+json","status":0}]}`, |
||||
`{"entries":[{"path":"a","hash":"011b4d03dd8c01f1049143cf9c4c817e4b167f1d1b83e5c6f0f10d89ba1e7bce","contentType":"","status":0},{"path":"b/","hash":"0a87b1c3e4bf013686cdf107ec58590f2004610ee58cc2240f26939f691215f5","contentType":"application/bzz-manifest+json","status":0}]}`, |
||||
`{"entries":[{"path":"b","hash":"011b4d03dd8c01f1049143cf9c4c817e4b167f1d1b83e5c6f0f10d89ba1e7bce","contentType":"","status":0},{"path":"c","hash":"011b4d03dd8c01f1049143cf9c4c817e4b167f1d1b83e5c6f0f10d89ba1e7bce","contentType":"","status":0}]}`, |
||||
} |
||||
|
||||
testrequests := make(map[string]int) |
||||
testrequests["/"] = 0 |
||||
testrequests["/a"] = 1 |
||||
testrequests["/a/b"] = 2 |
||||
testrequests["/x"] = 0 |
||||
testrequests[""] = 0 |
||||
|
||||
expectedfailrequests := []string{"", "/x"} |
||||
|
||||
reader := [3]*bytes.Reader{} |
||||
|
||||
key := [3]storage.Key{} |
||||
|
||||
dir, _ := ioutil.TempDir("", "bzz-storage-test") |
||||
|
||||
storeparams := &storage.StoreParams{ |
||||
ChunkDbPath: dir, |
||||
DbCapacity: 5000000, |
||||
CacheCapacity: 5000, |
||||
Radius: 0, |
||||
} |
||||
|
||||
localStore, err := storage.NewLocalStore(storage.MakeHashFunc("SHA3"), storeparams) |
||||
if err != nil { |
||||
t.Fatal(err) |
||||
} |
||||
chunker := storage.NewTreeChunker(storage.NewChunkerParams()) |
||||
dpa := &storage.DPA{ |
||||
Chunker: chunker, |
||||
ChunkStore: localStore, |
||||
} |
||||
dpa.Start() |
||||
defer dpa.Stop() |
||||
|
||||
wg := &sync.WaitGroup{} |
||||
|
||||
for i, mf := range testmanifest { |
||||
reader[i] = bytes.NewReader([]byte(mf)) |
||||
key[i], err = dpa.Store(reader[i], int64(len(mf)), wg, nil) |
||||
if err != nil { |
||||
t.Fatal(err) |
||||
} |
||||
wg.Wait() |
||||
} |
||||
|
||||
a := api.NewApi(dpa, nil) |
||||
|
||||
/// \todo iterate port numbers up if fail
|
||||
StartHttpServer(a, &Server{Addr: "127.0.0.1:8504", CorsString: ""}) |
||||
// how to wait for ListenAndServe to have initialized? This is pretty cruuuude
|
||||
// if we fix it we don't need maxproxyattempts anymore either
|
||||
time.Sleep(1000 * time.Millisecond) |
||||
for i := 0; i <= maxproxyattempts; i++ { |
||||
_, err := http.Get("http://127.0.0.1:8504/bzzr:/" + common.ToHex(key[0])[2:] + "/a") |
||||
if i == maxproxyattempts { |
||||
t.Fatalf("Failed to connect to proxy after %v attempts: %v", i, err) |
||||
} else if err != nil { |
||||
time.Sleep(100 * time.Millisecond) |
||||
continue |
||||
} |
||||
break |
||||
} |
||||
|
||||
for k, v := range testrequests { |
||||
var resp *http.Response |
||||
var respbody []byte |
||||
|
||||
url := "http://127.0.0.1:8504/bzzr:/" |
||||
if k[:] != "" { |
||||
url += common.ToHex(key[0])[2:] + "/" + k[1:] + "?content_type=text/plain" |
||||
} |
||||
resp, err = http.Get(url) |
||||
defer resp.Body.Close() |
||||
respbody, err = ioutil.ReadAll(resp.Body) |
||||
|
||||
if string(respbody) != testmanifest[v] { |
||||
isexpectedfailrequest := false |
||||
|
||||
for _, r := range expectedfailrequests { |
||||
if k[:] == r { |
||||
isexpectedfailrequest = true |
||||
} |
||||
} |
||||
if isexpectedfailrequest == false { |
||||
t.Fatalf("Response body does not match, expected: %v, got %v", testmanifest[v], string(respbody)) |
||||
} |
||||
} |
||||
} |
||||
|
||||
} |
||||
Loading…
Reference in new issue