diff --git a/Makefile b/Makefile index 58e9a755f..a56f2797e 100644 --- a/Makefile +++ b/Makefile @@ -147,7 +147,7 @@ test-e2e: ##@tests Run e2e tests # 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/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 20m ./e2e/rpc/... -network=3 build/env.sh go test -timeout 20m ./e2e/whisper/... diff --git a/e2e/rpc/rpc_test.go b/e2e/rpc/rpc_test.go index ab939df46..2770157e4 100644 --- a/e2e/rpc/rpc_test.go +++ b/e2e/rpc/rpc_test.go @@ -2,6 +2,7 @@ package rpc import ( "context" + "fmt" "sync" "testing" "time" @@ -74,7 +75,7 @@ func (s *RPCTestSuite) TestCallRPC() { { `{"jsonrpc":"2.0","method":"net_version","params":[],"id":67}`, 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) }, }, @@ -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}]`, 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) }, },