Merge "[FAB-6350] DeliverService CI failure: serve < register"

kchristidis · Gerrit Code Review · commit dbe3c78875ec · 2017-09-29T21:07:08.000Z
diff --git a/core/deliverservice/mocks/orderer.go b/core/deliverservice/mocks/orderer.go
@@ -36,7 +36,6 @@ func NewOrderer(port int, t *testing.T) *Orderer {
 	if err != nil {
 		panic(err)
 	}
-	go srv.Serve(lsnr)
 	o := &Orderer{Server: srv,
 		Listener:         lsnr,
 		t:                t,
@@ -45,6 +44,7 @@ func NewOrderer(port int, t *testing.T) *Orderer {
 		stopChan:         make(chan struct{}, 1),
 	}
 	orderer.RegisterAtomicBroadcastServer(srv, o)
+	go srv.Serve(lsnr)
 	return o
 }
 

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,6 @@ func NewOrderer(port int, t testing.T) Orderer {`
`36`	`36`	`if err != nil {`
`37`	`37`	`panic(err)`
`38`	`38`	`}`
`39`		`- go srv.Serve(lsnr)`
`40`	`39`	`o := &Orderer{Server: srv,`
`41`	`40`	`Listener: lsnr,`
`42`	`41`	`t: t,`
`@@ -45,6 +44,7 @@ func NewOrderer(port int, t testing.T) Orderer {`
`45`	`44`	`stopChan: make(chan struct{}, 1),`
`46`	`45`	`}`
`47`	`46`	`orderer.RegisterAtomicBroadcastServer(srv, o)`
	`47`	`+ go srv.Serve(lsnr)`
`48`	`48`	`return o`
`49`	`49`	`}`
`50`	`50`