Skip to content

Commit 87d2786

Browse files
Fix linting errors, remove unused variables and whitespace, remove commented out logging code.
1 parent 42b4cbb commit 87d2786

File tree

1 file changed

+4
-28
lines changed

1 file changed

+4
-28
lines changed

pkg/ext-proc/test/hermetic_test.go

+4-28
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ const (
4242
)
4343

4444
var (
45-
cfg *rest.Config
4645
k8sClient k8sclient.Client
4746
testEnv *envtest.Environment
4847
scheme = runtime.NewScheme()
@@ -173,7 +172,6 @@ func TestKubeInferenceModelRequest(t *testing.T) {
173172
wantBody []byte
174173
wantErr bool
175174
}{
176-
//TODO
177175
{
178176
name: "success",
179177
req: GenerateRequest("sql-lora"),
@@ -198,8 +196,6 @@ func TestKubeInferenceModelRequest(t *testing.T) {
198196
},
199197
}
200198

201-
log.Print("==== Start of TestKubeInferenceModelRequest") // logging
202-
203199
// Set up mock k8s API Client
204200
testEnv = &envtest.Environment{
205201
CRDDirectoryPaths: []string{filepath.Join("..", "..", "..", "config", "crd", "bases")},
@@ -254,9 +250,7 @@ func TestKubeInferenceModelRequest(t *testing.T) {
254250
},
255251
},
256252
}
257-
log.Print("&&&& Start of Tests &&&&") // logging
258253
for _, test := range tests {
259-
log.Printf("==== Start of Test: %+v", test) // logging
260254
t.Run(test.name, func(t *testing.T) {
261255
client, cleanup := setUpHermeticServer(t, cfg, pods)
262256
t.Cleanup(cleanup)
@@ -290,6 +284,7 @@ func TestKubeInferenceModelRequest(t *testing.T) {
290284
}
291285

292286
func setUpServer(t *testing.T, pods []*backend.PodMetrics, models map[string]*v1alpha1.InferenceModel) (client extProcPb.ExternalProcessor_ProcessClient, cleanup func()) {
287+
t.Logf("Setting up ExtProc server")
293288
server := StartExtProc(port, time.Second, time.Second, pods, models)
294289

295290
address := fmt.Sprintf("localhost:%v", port)
@@ -312,8 +307,7 @@ func setUpServer(t *testing.T, pods []*backend.PodMetrics, models map[string]*v1
312307
}
313308

314309
func setUpHermeticServer(t *testing.T, cfg *rest.Config, pods []*backend.PodMetrics) (client extProcPb.ExternalProcessor_ProcessClient, cleanup func()) {
315-
316-
t.Logf("===Setting up hermetic server")
310+
t.Logf("Setting up hermetic ExtProc server")
317311
klog.InitFlags(nil)
318312
flag.Parse()
319313
// Configure klog verbosity levels to print ext proc logs.
@@ -343,22 +337,18 @@ func setUpHermeticServer(t *testing.T, cfg *rest.Config, pods []*backend.PodMetr
343337

344338
var inferenceModels []*v1alpha1.InferenceModel
345339
for _, doc := range docs {
346-
// log.Printf("#### doc (yaml):%s", doc)
347340
inferenceModel := &v1alpha1.InferenceModel{}
348341
if err = yaml.Unmarshal(doc, inferenceModel); err != nil {
349342
log.Fatalf("Can't unmarshal object: %v", doc)
350343
}
351-
// log.Printf("#### inferenceModel.Kind: %v", inferenceModel.Kind)
352-
// log.Printf("#### object %+v", inferenceModel.Spec)
353344
if inferenceModel.Kind != "InferenceModel" {
354345
continue
355346
}
356-
// log.Print("$$$ ADDED OBJECT AS InferenceModel $$$")
357347
inferenceModels = append(inferenceModels, inferenceModel)
358348
}
359-
t.Logf("=== Inference models to add: %+v", inferenceModels)
349+
t.Logf("Inference models to add: %+v", inferenceModels)
360350
for _, model := range inferenceModels {
361-
t.Logf("=== Creating inference model: %+v", model)
351+
t.Logf("Creating inference model: %+v", model)
362352
if err := k8sClient.Create(context.Background(), model); err != nil {
363353
log.Fatalf("unable to create inferenceModel %v: %v", model.GetName(), err)
364354
}
@@ -376,17 +366,9 @@ func setUpHermeticServer(t *testing.T, cfg *rest.Config, pods []*backend.PodMetr
376366
if err != nil {
377367
log.Fatalf("Ext-proc failed with the err: %v", err)
378368
}
379-
// t.Logf("#### [Before] datastore inference models: %+v", runner.Datastore.GetInferenceModels()) // logging
380-
381-
// reflection.Register(server)
382-
383-
// log.Printf("#### datastore after: %+v", datastore) // logging
384-
// log.Printf("#### datastore inference models: %+v", datastore.InferenceModels) // logging
385369

386370
// Wait the reconciler to populate the datastore.
387371
time.Sleep(10 * time.Second)
388-
// log.Printf("#### [After] datastore inference models: %+v", runner.Datastore.GetInferenceModels()) // logging
389-
//log.Fatalf("STOP")
390372

391373
address := fmt.Sprintf("localhost:%v", port)
392374
// Create a grpc connection
@@ -395,8 +377,6 @@ func setUpHermeticServer(t *testing.T, cfg *rest.Config, pods []*backend.PodMetr
395377
log.Fatalf("Failed to connect to %v: %v", address, err)
396378
}
397379

398-
// log.Printf("#### connection: %+v", conn) // logging
399-
400380
ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
401381
client, err = extProcPb.NewExternalProcessorClient(conn).Process(ctx)
402382
if err != nil {
@@ -441,16 +421,12 @@ func readDocuments(fp string) ([][]byte, error) {
441421
if errors.Is(err, io.EOF) {
442422
break
443423
}
444-
445424
return nil, err
446425
}
447-
448426
docs = append(docs, doc)
449427
}
450-
451428
return docs, nil
452429
}
453-
454430
func pointer(v int32) *int32 {
455431
return &v
456432
}

0 commit comments

Comments
 (0)