forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-19 10:22:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rpc: improve TestSubscriptionMultipleNamespaces

Browse source
This commit is contained in:
Felix Lange 2018-10-09 14:59:28 +02:00
parent 46b4286c08
commit 810455a4a3
1 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
rpc/subscription_test.go
View file

@ -226,18 +226,19 @@ func waitForMessages(t *testing.T, in *json.Decoder, successes chan<- jsonSucces
// for multiple different namespaces. // for multiple different namespaces.
func TestSubscriptionMultipleNamespaces(t *testing.T) { func TestSubscriptionMultipleNamespaces(t *testing.T) {
var ( var (
namespaces = []string{"eth", "shh", "bzz"} namespaces = []string{"eth", "shh", "bzz"}
service = NotificationTestService{}
subCount = len(namespaces) * 2
notificationCount = 3
server = NewServer() server = NewServer()
service = NotificationTestService{}
clientConn, serverConn = net.Pipe() clientConn, serverConn = net.Pipe()
out = json.NewEncoder(clientConn)
out = json.NewEncoder(clientConn) in = json.NewDecoder(clientConn)
in = json.NewDecoder(clientConn) successes = make(chan jsonSuccessResponse)
successes = make(chan jsonSuccessResponse) failures = make(chan jsonErrResponse)
failures = make(chan jsonErrResponse) notifications = make(chan jsonNotification)
notifications = make(chan jsonNotification) errors = make(chan error, 10)
errors = make(chan error, 10)
) )
// setup and start server // setup and start server
@ -254,13 +255,12 @@ func TestSubscriptionMultipleNamespaces(t *testing.T) {
go waitForMessages(t, in, successes, failures, notifications, errors) go waitForMessages(t, in, successes, failures, notifications, errors)
// create subscriptions one by one // create subscriptions one by one
n := 3
for i, namespace := range namespaces { for i, namespace := range namespaces {
request := map[string]interface{}{ request := map[string]interface{}{
"id": i, "id": i,
"method": fmt.Sprintf("%s_subscribe", namespace), "method": fmt.Sprintf("%s_subscribe", namespace),
"version": "2.0", "version": "2.0",
"params": []interface{}{"someSubscription", n, i}, "params": []interface{}{"someSubscription", notificationCount, i},
} }
if err := out.Encode(&request); err != nil { if err := out.Encode(&request); err != nil {
@ -275,7 +275,7 @@ func TestSubscriptionMultipleNamespaces(t *testing.T) {
"id": i, "id": i,
"method": fmt.Sprintf("%s_subscribe", namespace), "method": fmt.Sprintf("%s_subscribe", namespace),
"version": "2.0", "version": "2.0",
"params": []interface{}{"someSubscription", n, i}, "params": []interface{}{"someSubscription", notificationCount, i},
}) })
} }
@ -284,12 +284,12 @@ func TestSubscriptionMultipleNamespaces(t *testing.T) {
} }
timeout := time.After(30 * time.Second) timeout := time.After(30 * time.Second)
subids := make(map[string]string, 2*len(namespaces)) subids := make(map[string]string, subCount)
count := make(map[string]int, 2*len(namespaces)) count := make(map[string]int, subCount)
allReceived := func() bool { allReceived := func() bool {
done := len(count) == len(namespaces) done := len(count) == subCount
for _, c := range count { for _, c := range count {
if c < n { if c < notificationCount {
done = false done = false
} }
} }
@ -310,14 +310,14 @@ func TestSubscriptionMultipleNamespaces(t *testing.T) {
for _, namespace := range namespaces { for _, namespace := range namespaces {
subid, found := subids[namespace] subid, found := subids[namespace]
if !found { if !found {
t.Errorf("Subscription for '%s' not created", namespace) t.Errorf("subscription for %q not created", namespace)
continue continue
} }
if count, found := count[subid]; !found || count < n { if count, found := count[subid]; !found || count < notificationCount {
t.Errorf("Didn't receive all notifications (%d<%d) in time for namespace '%s'", count, n, namespace) t.Errorf("didn't receive all notifications (%d<%d) in time for namespace %q", count, notificationCount, namespace)
} }
} }
return t.Fatal("timed out")
} }
} }
} }