test: surface DrainRegistryInFlight failures immediately via result channel

1 file · +7 -10

M internal/usecase/proxy/service_test.go +7 -10


@@ -539,14 +539,9 @@ func TestDrainRegistryInFlight(t *testing.T) {
539	539
540	540		svc.registryInFlight.Add(2)
541	541
542		-	done := make(chan struct{})
	542	+	result := make(chan bool, 1)
543	543		go func() {
544		-	drained := svc.DrainRegistryInFlight(50 * time.Millisecond)
545		-	if !drained {
546		-	// Signal failure via done channel by leaving it open — test will time out
547		-	return
548		-	}
549		-	close(done)
	544	+	result <- svc.DrainRegistryInFlight(50 * time.Millisecond)
550	545		}()
551	546
552	547		time.Sleep(5 * time.Millisecond)

@@ -554,10 +549,12 @@ func TestDrainRegistryInFlight(t *testing.T) {
554	549		svc.registryInFlight.Add(-1)
555	550
556	551		select {
557		-	case <-done:
558		-	// good — drained cleanly
	552	+	case drained := <-result:
	553	+	if !drained {
	554	+	t.Fatalf("DrainRegistryInFlight returned false; expected true after all requests completed")
	555	+	}
559	556		case <-time.After(500 * time.Millisecond):
560		-	t.Fatal("DrainRegistryInFlight did not return true after requests completed")
	557	+	t.Fatal("DrainRegistryInFlight did not return within timeout")
561	558		}
562	559		}
563	560

 	svc.registryInFlight.Add(2)
-	done := make(chan struct{})
+	result := make(chan bool, 1)
 	go func() {
-		drained := svc.DrainRegistryInFlight(50 * time.Millisecond)
+		result <- svc.DrainRegistryInFlight(50 * time.Millisecond)
-		if !drained {
-			// Signal failure via done channel by leaving it open — test will time out
-			return
-		}
-		close(done)
 	}()
 	time.Sleep(5 * time.Millisecond)
 	svc.registryInFlight.Add(-1)
 	select {
-	case <-done:
+	case drained := <-result:
-		// good — drained cleanly
+		if !drained {
+			t.Fatalf("DrainRegistryInFlight returned false; expected true after all requests completed")
+		}
 	case <-time.After(500 * time.Millisecond):
-		t.Fatal("DrainRegistryInFlight did not return true after requests completed")
+		t.Fatal("DrainRegistryInFlight did not return within timeout")
 	}
 }