Merge pull request #1658 from hyperledger/fix_race_test_ffdx

fix: test has race condition on ws before connect with DX callbacks

Author: peterbroadhurst

internal/dataexchange/ffdx/ffdx_test.go

@@ -22,14 +22,15 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"github.com/hyperledger/firefly/internal/metrics"
 	"io/ioutil"
 	"net/http"
 	"net/url"
 	"strings"
 	"testing"
 	"time"
 
+	"github.com/hyperledger/firefly/internal/metrics"
+
 	"github.com/hyperledger/firefly/mocks/metricsmocks"
 
 	"github.com/hyperledger/firefly-common/pkg/config"
@@ -780,6 +781,12 @@ func TestEventsWithManifest(t *testing.T) {
 	h, toServer, fromServer, _, done := newTestFFDX(t, true)
 	defer done()
 
+	mcb := &dataexchangemocks.Callbacks{}
+	mcb.On("DXConnect", h).Return(nil)
+	h.SetHandler("ns1", "node1", mcb)
+	ocb := &coremocks.OperationCallbacks{}
+	h.SetOperationHandler("ns1", ocb)
+
 	err := h.Start()
 	assert.NoError(t, err)
 
@@ -788,11 +795,6 @@ func TestEventsWithManifest(t *testing.T) {
 	msg := <-toServer
 	assert.Equal(t, `{"action":"ack","id":"0"}`, string(msg))
 
-	mcb := &dataexchangemocks.Callbacks{}
-	h.SetHandler("ns1", "node1", mcb)
-	ocb := &coremocks.OperationCallbacks{}
-	h.SetOperationHandler("ns1", ocb)
-
 	namespacedID1 := fmt.Sprintf("ns1:%s", fftypes.NewUUID())
 	ocb.On("OperationUpdate", mock.MatchedBy(func(ev *core.OperationUpdateAsync) bool {
 		return ev.NamespacedOpID == namespacedID1 &&