Share Integration Tests Between Server Implementations

Signed-off-by: Dave Tucker <[email protected]>

Makefile

@@ -22,6 +22,7 @@ build: prebuild
 test: prebuild
 	@echo "+ $@"
 	@go test -race -coverprofile=unit.cov -test.short -timeout 30s -v ./...
+	@IN_MEMORY_DATABASE=1 go test -race -coverprofile=ims-integration.cov -coverpkg=github.com/ovn-org/libovsdb/... -timeout 60s -v ./test/ovs
 
 .PHONY: integration-test
 integration-test:
@@ -31,7 +32,8 @@ integration-test:
 .PHONY: coverage
 coverage: test integration-test
 	@sed -i '1d' integration.cov
-	@cat unit.cov integration.cov > profile.cov
+	@sed -i '1d' ims-integration.cov
+	@cat unit.cov integration.cov ims-integration.cov > profile.cov
 
 .PHONY: bench
 bench: install-deps

server/server.go

@@ -18,7 +18,6 @@ import (
 type OvsdbServer struct {
 	srv          *rpc2.Server
 	listener     net.Listener
-	done         chan struct{}
 	db           Database
 	ready        bool
 	readyMutex   sync.RWMutex
@@ -36,7 +35,6 @@ type DatabaseModel struct {
 // NewOvsdbServer returns a new OvsdbServer
 func NewOvsdbServer(db Database, models ...DatabaseModel) (*OvsdbServer, error) {
 	o := &OvsdbServer{
-		done:         make(chan struct{}, 1),
 		db:           db,
 		models:       make(map[string]DatabaseModel),
 		modelsMutex:  sync.RWMutex{},
@@ -98,7 +96,6 @@ func (o *OvsdbServer) Close() {
 	o.ready = false
 	o.readyMutex.Unlock()
 	o.listener.Close()
-	close(o.done)
 }
 
 // Ready returns true if a server is ready to handle connections