[FAB-10709] fix flake in inproccontroller_test

This was caused by several things.
- The production code runs in a go routine and the test doesn't wait
- The production code was recently changed to stop using the injected
  test function
- The test was using an incorrect matcher

Change-Id: Id861d57081ef3260e7faf15e59822c94291b793d
Signed-off-by: Matthew Sykes <sykesmat@us.ibm.com>

Author: sykesm

core/container/inproccontroller/inproccontroller.go

@@ -112,6 +112,7 @@ func (ipc *inprocContainer) launchInProc(ctxt context.Context, id string, args [
 	var err error
 	ccchan := make(chan struct{}, 1)
 	ccsupportchan := make(chan struct{}, 1)
+	shimStartInProc := _shimStartInProc // shadow to avoid race in test
 	go func() {
 		defer close(ccchan)
 		inprocLogger.Debugf("chaincode started for %s", id)
@@ -121,12 +122,12 @@ func (ipc *inprocContainer) launchInProc(ctxt context.Context, id string, args [
 		if env == nil {
 			env = ipc.env
 		}
-		err := shim.StartInProc(env, args, ipc.chaincode, ccRcvPeerSend, peerRcvCCSend)
+		err := shimStartInProc(env, args, ipc.chaincode, ccRcvPeerSend, peerRcvCCSend)
 		if err != nil {
 			err = fmt.Errorf("chaincode-support ended with err: %s", err)
 			_inprocLoggerErrorf("%s", err)
 		}
-		inprocLogger.Debugf("chaincode ended with for  %s with err: %s", id, err)
+		inprocLogger.Debugf("chaincode ended for %s with err: %s", id, err)
 	}()
 
 	go func() {
@@ -138,7 +139,7 @@ func (ipc *inprocContainer) launchInProc(ctxt context.Context, id string, args [
 			err = fmt.Errorf("chaincode ended with err: %s", err)
 			_inprocLoggerErrorf("%s", err)
 		}
-		inprocLogger.Debugf("chaincode-support ended with for  %s with err: %s", id, err)
+		inprocLogger.Debugf("chaincode-support ended for %s with err: %s", id, err)
 	}()
 
 	select {

core/container/inproccontroller/inproccontroller_test.go

@@ -8,6 +8,7 @@ package inproccontroller
 
 import (
 	"errors"
+	"fmt"
 	"testing"
 	"time"
 
@@ -243,13 +244,14 @@ func TestLaunchprocShimStartInProcErr(t *testing.T) {
 		return errors.New("error")
 	}
 
+	done := make(chan struct{})
 	_inprocLoggerErrorfCounter := 0
 	_inprocLoggerErrorf = func(format string, args ...interface{}) {
-		_inprocLoggerErrorfCounter = _inprocLoggerErrorfCounter + 1
-
-		if _inprocLoggerErrorfCounter == 2 {
+		_inprocLoggerErrorfCounter++
+		if _inprocLoggerErrorfCounter == 1 {
 			assert.Equal(t, format, "%s", "Format is correct")
-			assert.Equal(t, args[0], "chaincode-support ended with err: error", "content is correct")
+			assert.Equal(t, fmt.Sprintf("%s", args[0]), "chaincode-support ended with err: error", "content is correct")
+			close(done)
 		}
 	}
 	mockContext := MockContext{}
@@ -265,6 +267,7 @@ func TestLaunchprocShimStartInProcErr(t *testing.T) {
 
 	err := mockInprocContainer.launchInProc(mockContext, "ID", args, env, MockCCSupport{})
 	assert.Nil(t, err, "err should be nil")
+	<-done
 }
 
 type MockCCSupportErr struct {