fix premature timeout of rpc connection during test

fix premature timeout of rpc connection during test fix premature timeout of rpc connection during test Signed-off-by: Amrit Prakash <[email protected]>
hyperledger · Apr 24, 2024 · 7a07f65 · 7a07f65
1 parent 50711a9
commit 7a07f65
Showing 1 changed file with 9 additions and 13 deletions.
diff --git a/common/deliverclient/blocksprovider/delivery_requester_test.go b/common/deliverclient/blocksprovider/delivery_requester_test.go
@@ -10,7 +10,6 @@ import (
 	"context"
 	"crypto/x509"
 	"fmt"
-	"log"
 	"sync"
 	"testing"
 	"time"
@@ -95,13 +94,11 @@ func (ds *deliverServer) Deliver(stream orderer.AtomicBroadcast_DeliverServer) e
 	ds.Lock()
 	err := ds.err
 	ds.Unlock()
-
 	if err != nil {
 		return nil
 	}
 	seekInfo, channel, err := readSeekEnvelope(stream)
 	require.NoError(ds.t, err)
-
 	timer := time.NewTimer(1 * time.Minute)
 	defer timer.Stop()
 
@@ -217,7 +214,6 @@ func newClusterNodeWithTLS(t *testing.T) *deliverServer {
 func TestDeliveryRequester_Connect(t *testing.T) {
 	osn := newClusterNode(t)
 	defer osn.stop()
-
 	fakeSigner := &fake.Signer{}
 	fakeSigner.SignReturns([]byte("good-sig"), nil)
 
@@ -228,23 +224,23 @@ func TestDeliveryRequester_Connect(t *testing.T) {
 	}
 	fakeDeliverStreamer := blocksprovider.DeliverAdapter{}
 
-	seekInfoEnv := &common.Envelope{}
-	endpoint := &orderers.Endpoint{
-		Address:   osn.srv.Address(),
-		RootCerts: nil,
-	}
-
 	dr := blocksprovider.NewDeliveryRequester(
 		"channel-id",
 		fakeSigner,
 		nil,
 		&fakeDialer,
 		fakeDeliverStreamer,
 	)
-	deliverClient, cancelFunc, err := dr.Connect(seekInfoEnv, endpoint)
-	if err != nil {
-		log.Fatalf("error : %v", err)
+
+	seekInfoEnv, err := dr.SeekInfoBlocksFrom(100)
+	require.NoError(t, err)
+	endpoint := &orderers.Endpoint{
+		Address:   osn.srv.Address(),
+		RootCerts: nil,
 	}
+
+	deliverClient, cancelFunc, err := dr.Connect(seekInfoEnv, endpoint)
+	time.Sleep(100 * time.Millisecond)
 	assert.Nil(t, err)
 	assert.NotNil(t, deliverClient)
 	assert.NotNil(t, cancelFunc)