Different port for each server test case

configcat · Mar 7, 2024 · 95e8a28 · 95e8a28
1 parent 6927578
commit 95e8a28
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 15 deletions.
diff --git a/diag/server_test.go b/diag/server_test.go
@@ -13,20 +13,20 @@ import (
 func TestNewServer(t *testing.T) {
 	errChan := make(chan error)
 	conf := config.DiagConfig{
-		Port:    5050,
+		Port:    5051,
 		Enabled: true,
 		Status:  config.StatusConfig{Enabled: true},
 		Metrics: config.MetricsConfig{Enabled: true},
 	}
 	srv := NewServer(&conf, status.NewReporter(&config.Config{SDKs: map[string]*config.SDKConfig{"sdk": {Key: "key"}}}), metrics.NewReporter(), log.NewNullLogger(), errChan)
 	go srv.Listen()
 
-	req, _ := http.NewRequest(http.MethodGet, "http://localhost:5050/status", http.NoBody)
+	req, _ := http.NewRequest(http.MethodGet, "http://localhost:5051/status", http.NoBody)
 	resp, err := http.DefaultClient.Do(req)
 	assert.NoError(t, err)
 	assert.Equal(t, http.StatusOK, resp.StatusCode)
 
-	req, _ = http.NewRequest(http.MethodGet, "http://localhost:5050/metrics", http.NoBody)
+	req, _ = http.NewRequest(http.MethodGet, "http://localhost:5051/metrics", http.NoBody)
 	resp, err = http.DefaultClient.Do(req)
 	assert.NoError(t, err)
 	assert.Equal(t, http.StatusOK, resp.StatusCode)
@@ -39,7 +39,7 @@ func TestNewServer(t *testing.T) {
 func TestNewServer_NotEnabled(t *testing.T) {
 	errChan := make(chan error)
 	conf := config.DiagConfig{
-		Port:    5050,
+		Port:    5052,
 		Enabled: true,
 		Status:  config.StatusConfig{Enabled: false},
 		Metrics: config.MetricsConfig{Enabled: false},
@@ -48,12 +48,12 @@ func TestNewServer_NotEnabled(t *testing.T) {
 	srv := NewServer(&conf, status.NewReporter(&config.Config{SDKs: map[string]*config.SDKConfig{"sdk": {Key: "key"}}}), metrics.NewReporter(), log.NewNullLogger(), errChan)
 	go srv.Listen()
 
-	req, _ := http.NewRequest(http.MethodGet, "http://localhost:5050/status", http.NoBody)
+	req, _ := http.NewRequest(http.MethodGet, "http://localhost:5052/status", http.NoBody)
 	resp, err := http.DefaultClient.Do(req)
 	assert.NoError(t, err)
 	assert.Equal(t, http.StatusNotFound, resp.StatusCode)
 
-	req, _ = http.NewRequest(http.MethodGet, "http://localhost:5050/metrics", http.NoBody)
+	req, _ = http.NewRequest(http.MethodGet, "http://localhost:5052/metrics", http.NoBody)
 	resp, err = http.DefaultClient.Do(req)
 	assert.NoError(t, err)
 	assert.Equal(t, http.StatusNotFound, resp.StatusCode)
@@ -66,20 +66,20 @@ func TestNewServer_NotEnabled(t *testing.T) {
 func TestNewServer_NilReporters(t *testing.T) {
 	errChan := make(chan error)
 	conf := config.DiagConfig{
-		Port:    5050,
+		Port:    5053,
 		Enabled: true,
 		Status:  config.StatusConfig{Enabled: true},
 		Metrics: config.MetricsConfig{Enabled: true},
 	}
 	srv := NewServer(&conf, nil, nil, log.NewNullLogger(), errChan)
 	go srv.Listen()
 
-	req, _ := http.NewRequest(http.MethodGet, "http://localhost:5050/status", http.NoBody)
+	req, _ := http.NewRequest(http.MethodGet, "http://localhost:5053/status", http.NoBody)
 	resp, err := http.DefaultClient.Do(req)
 	assert.NoError(t, err)
 	assert.Equal(t, http.StatusNotFound, resp.StatusCode)
 
-	req, _ = http.NewRequest(http.MethodGet, "http://localhost:5050/metrics", http.NoBody)
+	req, _ = http.NewRequest(http.MethodGet, "http://localhost:5053/metrics", http.NoBody)
 	resp, err = http.DefaultClient.Do(req)
 	assert.NoError(t, err)
 	assert.Equal(t, http.StatusNotFound, resp.StatusCode)

diff --git a/grpc/server_test.go b/grpc/server_test.go
@@ -32,7 +32,7 @@ func TestNewServer(t *testing.T) {
 	sdkClient := sdk.NewClient(ctx, log.NewNullLogger())
 	defer sdkClient.Close()
 
-	srv, _ := NewServer(map[string]sdk.Client{"test": sdkClient}, nil, &config.Config{Grpc: config.GrpcConfig{Port: 5060}}, log.NewNullLogger(), errChan)
+	srv, _ := NewServer(map[string]sdk.Client{"test": sdkClient}, nil, &config.Config{Grpc: config.GrpcConfig{Port: 5061}}, log.NewNullLogger(), errChan)
 
 	wg := sync.WaitGroup{}
 	wg.Add(1)
@@ -117,7 +117,7 @@ MK4Li/LGWcksyoF+hbPNXMFCIA==
 			sdkClient := sdk.NewClient(ctx, log.NewNullLogger())
 			defer sdkClient.Close()
 
-			srv, _ := NewServer(map[string]sdk.Client{"test": sdkClient}, nil, &config.Config{Grpc: config.GrpcConfig{Port: 5060}, Tls: tlsConf}, log.NewNullLogger(), errChan)
+			srv, _ := NewServer(map[string]sdk.Client{"test": sdkClient}, nil, &config.Config{Grpc: config.GrpcConfig{Port: 5062}, Tls: tlsConf}, log.NewNullLogger(), errChan)
 
 			wg := sync.WaitGroup{}
 			wg.Add(1)
@@ -158,7 +158,7 @@ func TestNewServer_TLS_Missing_Cert(t *testing.T) {
 	sdkClient := sdk.NewClient(ctx, log.NewNullLogger())
 	defer sdkClient.Close()
 
-	_, err := NewServer(map[string]sdk.Client{"test": sdkClient}, nil, &config.Config{Grpc: config.GrpcConfig{Port: 5060}, Tls: tlsConf}, log.NewDebugLogger(), errChan)
+	_, err := NewServer(map[string]sdk.Client{"test": sdkClient}, nil, &config.Config{Grpc: config.GrpcConfig{Port: 5063}, Tls: tlsConf}, log.NewDebugLogger(), errChan)
 	assert.Error(t, err)
 }
 

diff --git a/main_test.go b/main_test.go
@@ -14,6 +14,9 @@ import (
 func TestAppMain(t *testing.T) {
 	resetFlags()
 	t.Setenv("CONFIGCAT_SDKS", `{"sdk1":"XxPbCKmzIUGORk4vsufpzw/iC_KABprDEueeQs3yovVnQ"}`)
+	t.Setenv("CONFIGCAT_HTTP_PORT", "5081")
+	t.Setenv("CONFIGCAT_GRPC_PORT", "5082")
+	t.Setenv("CONFIGCAT_DIAG_PORT", "5083")
 
 	var exitCode int
 	closeSignal := make(chan os.Signal, 1)

diff --git a/web/server_test.go b/web/server_test.go
@@ -14,7 +14,7 @@ import (
 
 func TestNewServer(t *testing.T) {
 	errChan := make(chan error)
-	srv, _ := NewServer(http.HandlerFunc(ServeHTTP), log.NewNullLogger(), &config.Config{Http: config.HttpConfig{Port: 5050}}, errChan)
+	srv, _ := NewServer(http.HandlerFunc(ServeHTTP), log.NewNullLogger(), &config.Config{Http: config.HttpConfig{Port: 5071}}, errChan)
 
 	wg := sync.WaitGroup{}
 	wg.Add(1)
@@ -84,7 +84,7 @@ MK4Li/LGWcksyoF+hbPNXMFCIA==
 					{Cert: strings.ReplaceAll(cert, "\\", "/"), Key: strings.ReplaceAll(key, "\\", "/")},
 				},
 			}
-			srv, _ := NewServer(http.HandlerFunc(ServeHTTP), log.NewNullLogger(), &config.Config{Http: config.HttpConfig{Port: 5050}, Tls: tlsConf}, errChan)
+			srv, _ := NewServer(http.HandlerFunc(ServeHTTP), log.NewNullLogger(), &config.Config{Http: config.HttpConfig{Port: 5072}, Tls: tlsConf}, errChan)
 
 			wg := sync.WaitGroup{}
 			wg.Add(1)
@@ -127,7 +127,7 @@ func TestNewServer_TLS_Missing_Cert(t *testing.T) {
 			{Cert: "./non-existing.cert", Key: "./non-existing.key"},
 		},
 	}
-	_, err := NewServer(http.HandlerFunc(ServeHTTP), log.NewNullLogger(), &config.Config{Http: config.HttpConfig{Port: 5050}, Tls: tlsConf}, errChan)
+	_, err := NewServer(http.HandlerFunc(ServeHTTP), log.NewNullLogger(), &config.Config{Http: config.HttpConfig{Port: 5073}, Tls: tlsConf}, errChan)
 	assert.Error(t, err)
 }