More cluster package testing

cluster/cluster.go

@@ -5,6 +5,8 @@ import (
 	"fmt"
 	"log"
 	"net"
+	"os"
+	"sync"
 	"time"
 )
 
@@ -51,27 +53,33 @@ type Service struct {
 	store Store
 	addr  net.Addr
 
+	wg sync.WaitGroup
+
 	logger *log.Logger
 }
 
 // NewService returns a new instance of the cluster service
 func NewService(ln Listener, store Store) *Service {
 	return &Service{
-		ln:    ln,
+		ln:     ln,
-		store: store,
+		store:  store,
-		addr:  ln.Addr(),
+		addr:   ln.Addr(),
+		logger: log.New(os.Stderr, "[cluster] ", log.LstdFlags),
 	}
 }
 
 // Open opens the Service.
 func (s *Service) Open() error {
+	s.wg.Add(1)
 	go s.serve()
+	s.logger.Println("service listening on", s.ln.Addr())
 	return nil
 }
 
 // Close closes the service.
 func (s *Service) Close() error {
 	s.ln.Close()
+	s.wg.Wait()
 	return nil
 }
 
@@ -124,6 +132,8 @@ func (s *Service) SetPeers(raftAddr, apiAddr string) error {
 }
 
 func (s *Service) serve() error {
+	defer s.wg.Done()
+
 	for {
 		conn, err := s.ln.Accept()
 		if err != nil {

cluster/cluster_test.go

@@ -6,14 +6,20 @@ import (
 	"time"
 )
 
-func Test_NewService(t *testing.T) {
+func Test_NewServiceOpenClose(t *testing.T) {
-	ml := &mockListener{}
+	ml := mustNewMockListener()
 	ms := &mockStore{}
 	s := NewService(ml, ms)
 	if s == nil {
 		t.Fatalf("failed to create cluster service")
 	}
-	return
+
+	if err := s.Open(); err != nil {
+		t.Fatalf("failed to open cluster service")
+	}
+	if err := s.Close(); err != nil {
+		t.Fatalf("failed to close cluster service")
+	}
 }
 
 type mockListener struct {
@@ -31,11 +37,11 @@ func mustNewMockListener() *mockListener {
 }
 
 func (ml *mockListener) Accept() (c net.Conn, err error) {
-	return nil, nil
+	return ml.ln.Accept()
 }
 
 func (ml *mockListener) Addr() net.Addr {
-	return nil
+	return ml.ln.Addr()
 }
 
 func (ml *mockListener) Close() (err error) {