status-im
/
status-go
mirror of https://github.com/status-im/status-go.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update makefile with network flag for needed test and fix failing tests

This commit is contained in:
Alexander Ewetumo 2017-10-25 23:36:47 +01:00
parent e80768a090
commit 41d883a564
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -147,7 +147,7 @@ test-e2e: ##@tests Run e2e tests
# TODO(tiabc): make a single command out of them adding `-p 1` flag. # TODO(tiabc): make a single command out of them adding `-p 1` flag.
build/env.sh go test -timeout 5m ./e2e/accounts/... build/env.sh go test -timeout 5m ./e2e/accounts/...
build/env.sh go test -timeout 5m ./e2e/api/... -network=3 build/env.sh go test -timeout 5m ./e2e/api/... -network=3
build/env.sh go test -timeout 5m ./e2e/node/... build/env.sh go test -timeout 5m ./e2e/node/... -network=3
build/env.sh go test -timeout 15m ./e2e/jail/... build/env.sh go test -timeout 15m ./e2e/jail/...
build/env.sh go test -timeout 20m ./e2e/rpc/... -network=3 build/env.sh go test -timeout 20m ./e2e/rpc/... -network=3
build/env.sh go test -timeout 20m ./e2e/whisper/... build/env.sh go test -timeout 20m ./e2e/whisper/...

5
e2e/rpc/rpc_test.go
View File

@ -2,6 +2,7 @@ package rpc
import ( import (
"context" "context"
"fmt"
"sync" "sync"
"testing" "testing"
"time" "time"
@ -74,7 +75,7 @@ func (s *RPCTestSuite) TestCallRPC() {
{ {
`{"jsonrpc":"2.0","method":"net_version","params":[],"id":67}`, `{"jsonrpc":"2.0","method":"net_version","params":[],"id":67}`,
func(resultJSON string) { func(resultJSON string) {
expected := `{"jsonrpc":"2.0","id":67,"result":"4"}` expected := `{"jsonrpc":"2.0","id":67,"result":"` + fmt.Sprintf("%d", GetNetworkID()) + `"}`
s.Equal(expected, resultJSON) s.Equal(expected, resultJSON)
}, },
}, },
@ -88,7 +89,7 @@ func (s *RPCTestSuite) TestCallRPC() {
{ {
`[{"jsonrpc":"2.0","method":"net_version","params":[],"id":67},{"jsonrpc":"2.0","method":"web3_sha3","params":["0x68656c6c6f20776f726c64"],"id":68}]`, `[{"jsonrpc":"2.0","method":"net_version","params":[],"id":67},{"jsonrpc":"2.0","method":"web3_sha3","params":["0x68656c6c6f20776f726c64"],"id":68}]`,
func(resultJSON string) { func(resultJSON string) {
expected := `[{"jsonrpc":"2.0","id":67,"result":"4"},{"jsonrpc":"2.0","id":68,"result":"0x47173285a8d7341e5e972fc677286384f802f8ef42a5ec5f03bbfa254cb01fad"}]` expected := `[{"jsonrpc":"2.0","id":67,"result":"` + fmt.Sprintf("%d", GetNetworkID()) + `"},{"jsonrpc":"2.0","id":68,"result":"0x47173285a8d7341e5e972fc677286384f802f8ef42a5ec5f03bbfa254cb01fad"}]`
s.Equal(expected, resultJSON) s.Equal(expected, resultJSON)
}, },
}, },