add web_test.go

internal/metrics/metrics.go

@@ -42,6 +42,6 @@ func RunMetricsServer(router *mux.Router) {
 		ReadTimeout:  time.Duration(int32(opts.ReadTimeoutSeconds)) * time.Second,
 	}
 	router.Handle("/metrics", promhttp.Handler())
-	logger.Info("metric server is up and running", zap.Int("port", opts.MetricsPort))
+	logger.Info("starting metrics server", zap.Int("port", opts.MetricsPort))
 	panic(metricServer.ListenAndServe())
 }

internal/metrics/metrics_test.go

@@ -23,15 +23,15 @@ func TestRunMetricsServer(t *testing.T) {
 			ReadTimeout:  time.Duration(int32(opts.ReadTimeoutSeconds)) * time.Second,
 		}
 		router.Handle("/metrics", promhttp.Handler())
-		logger.Info("metric server is up and running", zap.Int("port", opts.MetricsPort))
+		logger.Info("starting metrics server", zap.Int("port", opts.MetricsPort))
 		errChan <- metricServer.ListenAndServe()
 	}()
 
 	for {
 		select {
 		case c := <-errChan:
 			t.Error(c)
-		case <-time.After(15 * time.Second):
+		case <-time.After(10 * time.Second):
 			t.Log("success")
 			return
 		}

internal/web/web.go

@@ -36,6 +36,6 @@ func RunWebServer(router *mux.Router) {
 		time.Duration(int32(opts.WriteTimeoutSeconds))*time.Second,
 		time.Duration(int32(opts.ReadTimeoutSeconds))*time.Second, logger)
 
-	logger.Info("web server is up and running", zap.Int("port", opts.ServerPort))
+	logger.Info("starting web server", zap.Int("port", opts.ServerPort))
 	panic(webServer.ListenAndServe())
 }

internal/web/web_test.go

@@ -0,0 +1,33 @@
+package web
+
+import (
+	"fmt"
+	"testing"
+	"time"
+
+	"github.com/gorilla/mux"
+	"go.uber.org/zap"
+)
+
+func TestRunWebServer(t *testing.T) {
+	errChan := make(chan error, 1)
+
+	go func() {
+		router := mux.NewRouter()
+		webServer := initServer(router, fmt.Sprintf(":%d", opts.ServerPort),
+			time.Duration(int32(opts.WriteTimeoutSeconds))*time.Second,
+			time.Duration(int32(opts.ReadTimeoutSeconds))*time.Second, logger)
+		logger.Info("starting web server", zap.Int("port", opts.ServerPort))
+		errChan <- webServer.ListenAndServe()
+	}()
+
+	for {
+		select {
+		case c := <-errChan:
+			t.Error(c)
+		case <-time.After(10 * time.Second):
+			t.Log("success")
+			return
+		}
+	}
+}