test: minor test fixes

Author: spwoodcock

app/api/nodeodm_api_test.go

@@ -8,6 +8,7 @@ import (
 	"net/http/httptest"
 	"testing"
 
+	"github.com/hotosm/scaleodm/app/config"
 	"github.com/hotosm/scaleodm/app/meta"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -82,9 +83,10 @@ func TestTaskNewEndpoint(t *testing.T) {
 
 	_, handler := NewAPI(metadataStore, wfClient)
 
-	// Initialize cluster
+	// Initialize cluster with the same URL that the API will use
 	ctx := context.Background()
-	err := db.InitLocalClusterRecord(ctx, "http://localhost:31100")
+	clusterURL := config.SCALEODM_CLUSTER_URL
+	err := db.InitLocalClusterRecord(ctx, clusterURL)
 	require.NoError(t, err)
 
 	// Create task request
@@ -156,13 +158,14 @@ func TestTaskInfoEndpoint(t *testing.T) {
 
 	// Create job metadata (workflow may or may not exist in cluster)
 	ctx := context.Background()
-	err := db.InitLocalClusterRecord(ctx, "http://localhost:31100")
+	clusterURL := config.SCALEODM_CLUSTER_URL
+	err := db.InitLocalClusterRecord(ctx, clusterURL)
 	require.NoError(t, err)
 
 	workflowName := "test-workflow-info"
 	_, err = metadataStore.CreateJob(
 		ctx,
-		"http://localhost:31100",
+		clusterURL,
 		workflowName,
 		"test-project",
 		"s3://bucket/images/",
@@ -182,10 +185,17 @@ func TestTaskInfoEndpoint(t *testing.T) {
 	// Should return OK even if workflow doesn't exist in cluster (metadata exists)
 	assert.Equal(t, http.StatusOK, w.Code)
 
-	// Huma returns the body content directly, not wrapped in a Body field
+	// Huma may return the body wrapped in a Body field or directly
 	var response TaskInfo
-	err = json.Unmarshal(w.Body.Bytes(), &response)
-	require.NoError(t, err)
+	var wrappedResponse TaskInfoResponse
+	err = json.Unmarshal(w.Body.Bytes(), &wrappedResponse)
+	if err == nil && wrappedResponse.Body.UUID != "" {
+		response = wrappedResponse.Body
+	} else {
+		// Try direct unmarshaling
+		err = json.Unmarshal(w.Body.Bytes(), &response)
+		require.NoError(t, err)
+	}
 	assert.Equal(t, workflowName, response.UUID)
 }
 

app/meta/cluster_test.go

@@ -89,24 +89,27 @@ func TestGetClusterCapacity(t *testing.T) {
 	store := NewStore(db)
 	ctx := context.Background()
 
+	// Use a consistent cluster URL for the test
+	clusterURL := "http://localhost:31100"
+
 	// Initialize cluster with max 10 jobs
-	err := db.InitLocalClusterRecord(ctx, "http://localhost:31100")
+	err := db.InitLocalClusterRecord(ctx, clusterURL)
 	require.NoError(t, err)
 
 	// Update cluster details
-	err = store.UpdateClusterDetails(ctx, "http://localhost:31100", 10, 10)
+	err = store.UpdateClusterDetails(ctx, clusterURL, 10, 10)
 	require.NoError(t, err)
 
 	// Get capacity (should be 0 active jobs)
-	maxJobs, activeJobs, err := store.GetClusterCapacity(ctx, "http://localhost:31100")
+	maxJobs, activeJobs, err := store.GetClusterCapacity(ctx, clusterURL)
 	require.NoError(t, err)
 	assert.Equal(t, 10, maxJobs)
 	assert.Equal(t, 0, activeJobs)
 
 	// Create some running jobs
 	_, err = store.CreateJob(
 		ctx,
-		"http://localhost:31100",
+		clusterURL,
 		"test-workflow-1",
 		"test-project",
 		"s3://bucket/images/",
@@ -121,7 +124,7 @@ func TestGetClusterCapacity(t *testing.T) {
 
 	_, err = store.CreateJob(
 		ctx,
-		"http://localhost:31100",
+		clusterURL,
 		"test-workflow-2",
 		"test-project",
 		"s3://bucket/images/",
@@ -135,15 +138,15 @@ func TestGetClusterCapacity(t *testing.T) {
 	require.NoError(t, err)
 
 	// Get capacity again (should be 2 active jobs)
-	maxJobs, activeJobs, err = store.GetClusterCapacity(ctx, "http://localhost:31100")
+	maxJobs, activeJobs, err = store.GetClusterCapacity(ctx, clusterURL)
 	require.NoError(t, err)
 	assert.Equal(t, 10, maxJobs)
 	assert.Equal(t, 2, activeJobs)
 
 	// Create a completed job (should not count)
 	_, err = store.CreateJob(
 		ctx,
-		"http://localhost:31100",
+		clusterURL,
 		"test-workflow-3",
 		"test-project",
 		"s3://bucket/images/",
@@ -157,7 +160,7 @@ func TestGetClusterCapacity(t *testing.T) {
 	require.NoError(t, err)
 
 	// Get capacity again (should still be 2 active jobs)
-	maxJobs, activeJobs, err = store.GetClusterCapacity(ctx, "http://localhost:31100")
+	maxJobs, activeJobs, err = store.GetClusterCapacity(ctx, clusterURL)
 	require.NoError(t, err)
 	assert.Equal(t, 10, maxJobs)
 	assert.Equal(t, 2, activeJobs)