Skip to content

Commit 4f96d49

Browse files
authored
chore: align reloader test with volume watcher interface (#10096)
1 parent 076c2a6 commit 4f96d49

1 file changed

Lines changed: 21 additions & 9 deletions

File tree

cmd/reloader/app/cmd_test.go

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,13 @@ import (
2626
"testing"
2727
"time"
2828

29+
"github.com/fsnotify/fsnotify"
2930
"go.uber.org/zap"
3031
"google.golang.org/grpc"
3132
"google.golang.org/grpc/credentials/insecure"
3233
"google.golang.org/grpc/reflection/grpc_reflection_v1"
3334

34-
cfgcm "github.com/apecloud/kubeblocks/pkg/parameters/configmanager"
35+
cfgcore "github.com/apecloud/kubeblocks/pkg/configuration/config_manager"
3536
)
3637

3738
type fakeConfigHandler struct{}
@@ -40,11 +41,19 @@ func (f *fakeConfigHandler) OnlineUpdate(context.Context, string, map[string]str
4041
return nil
4142
}
4243

44+
func (f *fakeConfigHandler) VolumeHandle(context.Context, fsnotify.Event) error {
45+
return nil
46+
}
47+
48+
func (f *fakeConfigHandler) MountPoint() []string {
49+
return nil
50+
}
51+
4352
func TestStartGRPCServiceEnablesReflection(t *testing.T) {
4453
t.Helper()
4554

4655
logger = zap.NewNop().Sugar()
47-
cfgcm.SetLogger(zap.NewNop())
56+
cfgcore.SetLogger(zap.NewNop())
4857

4958
listener, err := net.Listen("tcp", "127.0.0.1:0")
5059
if err != nil {
@@ -53,17 +62,20 @@ func TestStartGRPCServiceEnablesReflection(t *testing.T) {
5362
port := listener.Addr().(*net.TCPAddr).Port
5463
_ = listener.Close()
5564

56-
opts := &serviceOptions{
57-
GrpcPort: port,
58-
PodIP: localhostAddress,
65+
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
66+
defer cancel()
67+
68+
opts := &VolumeWatcherOpts{
69+
ServiceOpt: ReconfigureServiceOptions{
70+
GrpcPort: port,
71+
PodIP: localhostAddress,
72+
},
73+
LogLevel: "info",
5974
}
60-
if err := startGRPCService(opts, &fakeConfigHandler{}); err != nil {
75+
if err := startGRPCService(opts, ctx, &fakeConfigHandler{}); err != nil {
6176
t.Fatalf("failed to start grpc service: %v", err)
6277
}
6378

64-
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
65-
defer cancel()
66-
6779
conn, err := grpc.DialContext(ctx, net.JoinHostPort(localhostAddress, strconv.Itoa(port)), grpc.WithTransportCredentials(insecure.NewCredentials()), grpc.WithBlock())
6880
if err != nil {
6981
t.Fatalf("failed to dial grpc service: %v", err)

0 commit comments

Comments
 (0)