From 08c47a16a021156053074bee9c3567a8ebd1e6a3 Mon Sep 17 00:00:00 2001 From: LordMathis Date: Mon, 27 Oct 2025 18:35:16 +0100 Subject: [PATCH] Fix operations tests --- pkg/manager/manager.go | 2 +- pkg/manager/manager_test.go | 2 +- pkg/manager/operations_test.go | 23 ++++++++++------------- pkg/server/routes.go | 4 ++-- 4 files changed, 14 insertions(+), 17 deletions(-) diff --git a/pkg/manager/manager.go b/pkg/manager/manager.go index b25c0ae..679474d 100644 --- a/pkg/manager/manager.go +++ b/pkg/manager/manager.go @@ -110,7 +110,7 @@ func (im *instanceManager) Shutdown() { defer wg.Done() fmt.Printf("Stopping instance %s...\n", inst.Name) if err := inst.Stop(); err != nil { - fmt.Printf("Error stopping instance %s: %w\n", inst.Name, err) + log.Printf("Error stopping instance %s: %v\n", inst.Name, err) } }(inst) } diff --git a/pkg/manager/manager_test.go b/pkg/manager/manager_test.go index 22a5d7f..f2ae74b 100644 --- a/pkg/manager/manager_test.go +++ b/pkg/manager/manager_test.go @@ -113,7 +113,7 @@ func TestConcurrentAccess(t *testing.T) { } // Concurrent list operations - for i := 0; i < 3; i++ { + for range 3 { wg.Add(1) go func() { defer wg.Done() diff --git a/pkg/manager/operations_test.go b/pkg/manager/operations_test.go index a0b82a4..d4bcb1b 100644 --- a/pkg/manager/operations_test.go +++ b/pkg/manager/operations_test.go @@ -155,15 +155,13 @@ func TestDeleteInstance_RunningInstanceFails(t *testing.T) { }, } - _, err := mgr.CreateInstance("test-instance", options) + inst, err := mgr.CreateInstance("test-instance", options) if err != nil { t.Fatalf("CreateInstance failed: %v", err) } - _, err = mgr.StartInstance("test-instance") - if err != nil { - t.Fatalf("StartInstance failed: %v", err) - } + // Simulate starting the instance + inst.SetStatus(instance.Running) // Should fail to delete running instance err = mgr.DeleteInstance("test-instance") @@ -186,15 +184,13 @@ func TestUpdateInstance(t *testing.T) { }, } - _, err := mgr.CreateInstance("test-instance", options) + inst, err := mgr.CreateInstance("test-instance", options) if err != nil { t.Fatalf("CreateInstance failed: %v", err) } - _, err = mgr.StartInstance("test-instance") - if err != nil { - t.Fatalf("StartInstance failed: %v", err) - } + // Simulate starting the instance + inst.SetStatus(instance.Running) // Update running instance with new model newOptions := &instance.Options{ @@ -212,9 +208,10 @@ func TestUpdateInstance(t *testing.T) { t.Fatalf("UpdateInstance failed: %v", err) } - // Should still be running after update - if !updated.IsRunning() { - t.Error("Instance should be running after update") + // Should be either running or restarting after update + status := updated.GetStatus() + if status != instance.Running && status != instance.Restarting { + t.Error("Instance should be running or restarting after update") } if updated.GetOptions().BackendOptions.LlamaServerOptions.Model != "/path/to/new-model.gguf" { diff --git a/pkg/server/routes.go b/pkg/server/routes.go index 87c9148..618dbc0 100644 --- a/pkg/server/routes.go +++ b/pkg/server/routes.go @@ -1,7 +1,7 @@ package server import ( - "fmt" + "log" "github.com/go-chi/chi/v5" "github.com/go-chi/chi/v5/middleware" @@ -159,7 +159,7 @@ func SetupRouter(handler *Handler) *chi.Mux { // Serve WebUI files if err := webui.SetupWebUI(r); err != nil { - fmt.Printf("Failed to set up WebUI: %w\n", err) + log.Printf("Failed to set up WebUI: %v\n", err) } return r