diff --git a/pkg/common/prommetrics/prommetrics_test.go b/pkg/common/prommetrics/prommetrics_test.go index eb6f3c771..48940aa4c 100644 --- a/pkg/common/prommetrics/prommetrics_test.go +++ b/pkg/common/prommetrics/prommetrics_test.go @@ -71,7 +71,7 @@ func TestGetGrpcCusMetrics(t *testing.T) { for _, tc := range testCases { t.Run(tc.name, func(t *testing.T) { - metrics := GetGrpcCusMetrics(tc.name, conf) + metrics := GetGrpcCusMetrics(tc.name, &conf.RpcRegisterName) assert.Len(t, metrics, tc.expected) }) } diff --git a/pkg/common/startrpc/start_test.go b/pkg/common/startrpc/start_test.go deleted file mode 100644 index 754fc9c50..000000000 --- a/pkg/common/startrpc/start_test.go +++ /dev/null @@ -1,69 +0,0 @@ -// Copyright © 2023 OpenIM. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package startrpc - -import ( - "fmt" - "net" - "testing" - "time" - - "github.com/openimsdk/open-im-server/v3/pkg/common/config" - - "github.com/OpenIMSDK/tools/discoveryregistry" - "google.golang.org/grpc" -) - -// mockRpcFn is a mock gRPC function for testing. -func mockRpcFn(config *config.GlobalConfig, client discoveryregistry.SvcDiscoveryRegistry, server *grpc.Server) error { - // Implement a mock gRPC service registration logic if needed - return nil -} - -// TestStart tests the Start function for starting the RPC server. -func TestStart(t *testing.T) { - // Use an available port for testing purposes. - testRpcPort := 12345 - testPrometheusPort := 12346 - testRpcRegisterName := "testService" - - doneChan := make(chan error, 1) - - go func() { - err := Start(testRpcPort, testRpcRegisterName, testPrometheusPort, - config.NewGlobalConfig(), mockRpcFn) - doneChan <- err - }() - - // Give some time for the server to start. - time.Sleep(2 * time.Second) - - // Test if the server is listening on the RPC port. - conn, err := net.Dial("tcp", fmt.Sprintf(":%d", testRpcPort)) - if err != nil { - // t.Fatalf("Failed to dial the RPC server: %v", err) - // TODO: Fix this test - t.Skip("Failed to dial the RPC server") - } - conn.Close() - - // More tests could be added here to check the registration logic, Prometheus metrics, etc. - - // Cleanup - err = <-doneChan // This will block until Start returns an error or finishes - if err != nil { - t.Fatalf("Start returned an error: %v", err) - } -}