Check queuing works

Author: sjmiller609

cmd/api/api/images_test.go

@@ -1,6 +1,7 @@
 package api
 
 import (
+	"fmt"
 	"testing"
 	"time"
 
@@ -39,7 +40,21 @@ func TestCreateImage_Async(t *testing.T) {
 	svc := newTestService(t)
 	ctx := ctx()
 
-	t.Log("Creating image...")
+	// Create images before alpine to populate the queue
+	t.Log("Creating image queue...")
+	queueImages := []string{
+		"docker.io/library/busybox:latest",
+		"docker.io/library/nginx:alpine",
+	}
+	for _, name := range queueImages {
+		_, err := svc.CreateImage(ctx, oapi.CreateImageRequestObject{
+			Body: &oapi.CreateImageRequest{Name: name},
+		})
+		require.NoError(t, err)
+	}
+
+	// Create alpine (should be last in queue)
+	t.Log("Creating alpine image (should be queued)...")
 	createResp, err := svc.CreateImage(ctx, oapi.CreateImageRequestObject{
 		Body: &oapi.CreateImageRequest{
 			Name: "docker.io/library/alpine:latest",
@@ -53,22 +68,35 @@ func TestCreateImage_Async(t *testing.T) {
 	img := oapi.Image(acceptedResp)
 	require.Equal(t, "docker.io/library/alpine:latest", img.Name)
 	require.Equal(t, "img-alpine-latest", img.Id)
-	t.Logf("Image created: id=%s, initial_status=%s", img.Id, img.Status)
+	t.Logf("Image created: id=%s, initial_status=%s, queue_position=%v", 
+		img.Id, img.Status, img.QueuePosition)
 
 	// Poll until ready
 	t.Log("Polling for completion...")
-	for i := 0; i < 300; i++ {
+	lastStatus := img.Status
+	lastQueuePos := getQueuePos(img.QueuePosition)
+	
+	for i := 0; i < 3000; i++ {
 		getResp, err := svc.GetImage(ctx, oapi.GetImageRequestObject{Id: img.Id})
 		require.NoError(t, err)
 
 		imgResp, ok := getResp.(oapi.GetImage200JSONResponse)
 		require.True(t, ok, "expected 200 response")
 
 		currentImg := oapi.Image(imgResp)
+		currentQueuePos := getQueuePos(currentImg.QueuePosition)
 
-		if i%10 == 0 || currentImg.Status != img.Status {
-			t.Logf("Poll #%d: status=%s, queue_position=%v, has_size=%v", 
-				i+1, currentImg.Status, currentImg.QueuePosition, currentImg.SizeBytes != nil)
+		// Log when status or queue position changes
+		if currentImg.Status != lastStatus || currentQueuePos != lastQueuePos {
+			t.Logf("Update: status=%s, queue_position=%v", currentImg.Status, formatQueuePos(currentImg.QueuePosition))
+			
+			// Queue position should only decrease (never increase)
+			if lastQueuePos > 0 && currentQueuePos > lastQueuePos {
+				t.Errorf("Queue position increased: %d -> %d", lastQueuePos, currentQueuePos)
+			}
+			
+			lastStatus = currentImg.Status
+			lastQueuePos = currentQueuePos
 		}
 
 		if currentImg.Status == oapi.ImageStatus(images.StatusReady) {
@@ -87,9 +115,24 @@ func TestCreateImage_Async(t *testing.T) {
 			t.Fatalf("Build failed: %s", errMsg)
 		}
 
-		time.Sleep(100 * time.Millisecond)
+		time.Sleep(10 * time.Millisecond)
 	}
 
 	t.Fatal("Build did not complete within 30 seconds")
 }
 
+func getQueuePos(pos *int) int {
+	if pos == nil {
+		return 0
+	}
+	return *pos
+}
+
+func formatQueuePos(pos *int) string {
+	if pos == nil {
+		return "none"
+	}
+	return fmt.Sprintf("%d", *pos)
+}
+
+