Merge pull request #801 from doringeman/e2e

test(e2e): add ps and unload tests and explicit backend cleanup

Author: doringeman

e2e/cli_test.go

@@ -40,6 +40,41 @@ func TestE2E_CLI(t *testing.T) {
 				t.Logf("run output: %s", out)
 			})
 
+			t.Run("PS", func(t *testing.T) {
+				out, err := runCLI(t, "ps")
+				if err != nil {
+					t.Fatalf("cli ps failed: %v\noutput: %s", err, out)
+				}
+				// TODO: ps should return lowercased model names like ls does
+				if !strings.Contains(strings.ToLower(out), "smollm2") {
+					t.Errorf("expected model in ps output, got:\n%s", out)
+				}
+				if !strings.Contains(out, bc.name) {
+					t.Errorf("expected backend %s in ps output, got:\n%s", bc.name, out)
+				}
+				t.Logf("ps output:\n%s", out)
+			})
+
+			t.Run("Unload", func(t *testing.T) {
+				out, err := runCLI(t, "unload", bc.model)
+				if err != nil {
+					t.Fatalf("cli unload failed: %v\noutput: %s", err, out)
+				}
+			})
+
+			t.Run("PSAfterUnload", func(t *testing.T) {
+				out, err := runCLI(t, "ps")
+				if err != nil {
+					t.Fatalf("cli ps failed: %v\noutput: %s", err, out)
+				}
+				if strings.Contains(out, "smollm2") {
+					t.Errorf("model still running after unload:\n%s", out)
+				}
+				if strings.Contains(out, bc.name) {
+					t.Errorf("backend %s still running after unload:\n%s", bc.name, out)
+				}
+			})
+
 			t.Run("Remove", func(t *testing.T) {
 				out, err := runCLI(t, "rm", "-f", bc.model)
 				if err != nil {

e2e/inference_test.go

@@ -8,6 +8,8 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/docker/model-runner/pkg/inference/backends/llamacpp"
+	"github.com/docker/model-runner/pkg/inference/backends/vllm"
 	"github.com/docker/model-runner/pkg/inference/platform"
 )
 
@@ -18,10 +20,10 @@ type backendTestCase struct {
 
 var backends = func() []backendTestCase {
 	b := []backendTestCase{
-		{"llama.cpp", ggufModel},
+		{llamacpp.Name, ggufModel},
 	}
 	if platform.SupportsVLLMMetal() {
-		b = append(b, backendTestCase{"vllm-metal", mlxModel})
+		b = append(b, backendTestCase{vllm.Name, mlxModel})
 	}
 	return b
 }()
@@ -170,6 +172,10 @@ func TestE2E_Inference(t *testing.T) {
 			})
 
 			t.Run("Remove", func(t *testing.T) {
+				out, err := runCLI(t, "unload", "--all")
+				if err != nil {
+					t.Fatalf("cli unload failed: %v\noutput: %s", err, out)
+				}
 				removeModel(t, bc.model)
 				t.Logf("removed %s", bc.model)
 			})