add integration tests

app/rest/api/import.go

@@ -6,6 +6,7 @@ import (
 	"log"
 	"net/http"
 	"strings"
+	"sync"
 	"time"
 
 	"github.com/didip/tollbooth"
@@ -27,6 +28,7 @@ type Import struct {
 	SecretKey      string
 
 	httpServer *http.Server
+	lock       sync.Mutex
 }
 
 // Run the listener and request's router, activate rest server
@@ -34,7 +36,11 @@ type Import struct {
 func (s *Import) Run(port int) {
 	log.Printf("[INFO] activate import server on port %d", port)
 	router := s.routes()
+
+	s.lock.Lock()
 	s.httpServer = &http.Server{Addr: fmt.Sprintf("127.0.0.1:%d", port), Handler: router}
+	s.lock.Unlock()
+
 	err := s.httpServer.ListenAndServe()
 	log.Printf("[WARN] http server terminated, %s", err)
 }
@@ -44,9 +50,13 @@ func (s *Import) Shutdown() {
 	log.Print("[WARN] shutdown import server")
 	ctx, cancel := context.WithTimeout(context.Background(), time.Second)
 	defer cancel()
+
+	s.lock.Lock()
 	if err := s.httpServer.Shutdown(ctx); err != nil {
 		log.Printf("[DEBUG] importer shutdown error, %s", err)
 	}
+	s.lock.Unlock()
+
 	log.Print("[DEBUG] shutdown import server completed")
 }
 

app/rest/api/rest.go

@@ -11,6 +11,7 @@ import (
 	"net/http"
 	"strconv"
 	"strings"
+	"sync"
 	"time"
 
 	"github.com/didip/tollbooth"
@@ -44,7 +45,9 @@ type Rest struct {
 		Critical int
 	}
 
-	httpServer   *http.Server
+	httpServer *http.Server
+	lock       sync.Mutex
+
 	adminService admin
 }
 
@@ -64,6 +67,7 @@ func (s *Rest) Run(port int) {
 
 	router := s.routes()
 
+	s.lock.Lock()
 	s.httpServer = &http.Server{
 		Addr:              fmt.Sprintf(":%d", port),
 		Handler:           router,
@@ -71,6 +75,8 @@ func (s *Rest) Run(port int) {
 		WriteTimeout:      5 * time.Second,
 		IdleTimeout:       30 * time.Second,
 	}
+	s.lock.Unlock()
+
 	err := s.httpServer.ListenAndServe()
 	log.Printf("[WARN] http server terminated, %s", err)
 }
@@ -80,10 +86,12 @@ func (s *Rest) Shutdown() {
 	log.Print("[WARN] shutdown rest server")
 	ctx, cancel := context.WithTimeout(context.Background(), time.Second)
 	defer cancel()
+	s.lock.Lock()
 	if err := s.httpServer.Shutdown(ctx); err != nil {
 		log.Printf("[DEBUG] rest shutdown error, %s", err)
 	}
 	log.Print("[DEBUG] shutdown rest server completed")
+	s.lock.Unlock()
 }
 
 func (s *Rest) routes() chi.Router {