Get integration test running

Author: nikhilwoodruff

.github/workflows/gcp-deploy.reusable.yml

@@ -188,4 +188,6 @@ jobs:
         full_integ_test_access_token: ${{ steps.get-full-id-token.outputs.id_token }}
         full_integ_test_base_url: ${{ needs.deploy.outputs.full_api_url }}
         simulation_integ_test_access_token: ${{ steps.get-simulation-id-token.outputs.id_token }}
-        simulation_integ_test_base_url: ${{ needs.deploy.outputs.simulation_api_url }}
+        simulation_integ_test_base_url: ${{ needs.deploy.outputs.simulation_api_url }}
+        workflow_integ_test_project_id: ${{ vars.PROJECT_ID }}
+        workflow_integ_test_us_model_version: ${{ steps.versions.outputs.us_version }}

.github/workflows/pr.yml

@@ -131,8 +131,8 @@ jobs:
       run: |
         cd projects/policyengine-apis-integ
         uv sync --extra test
-        # Run tests that don't require authentication
-        uv run pytest tests/full/test_ping.py tests/simulation/test_ping.py -v
+        # Run tests that don't require GCP credentials
+        uv run pytest tests/ -v -m "not requires_gcp"
     
     - name: Show service logs on failure
       if: failure()

Makefile

@@ -113,11 +113,12 @@ test-integration: generate-clients
 	@echo "Make sure services are running with 'make up' first!"
 	@cd projects/policyengine-apis-integ && \
 		uv sync --extra test && \
-		uv run pytest tests/full/test_ping.py tests/simulation/test_ping.py -v
+		uv run pytest tests/ -v -m "not requires_gcp"
 
 test-integration-all: generate-clients
 	@echo "Running all integration tests against local services..."
 	@echo "Make sure services are running with 'make up' first!"
+	@echo "Note: Workflow tests will be skipped without GCP credentials"
 	@cd projects/policyengine-apis-integ && \
 		uv sync --extra test && \
 		uv run pytest tests/ -v

projects/policyengine-apis-integ/pyproject.toml

@@ -24,6 +24,9 @@ pythonpath = [
   "src",
 ]
 testpaths = ["tests"]
+markers = [
+    "requires_gcp: mark test as requiring GCP credentials and workflow access",
+]
 
 [tool.uv.sources]
 policyengine_api_full_client = { path = "../policyengine-api-full/artifacts/clients/python" }

projects/policyengine-apis-integ/tests/simulation_workflow/conftest.py

@@ -1,6 +1,7 @@
 from pydantic_settings import BaseSettings, SettingsConfigDict
 import pytest
 from .simplified_workflow_client import SimplifiedWorkflowClient
+import os
 
 
 class Settings(BaseSettings):
@@ -15,6 +16,15 @@ class Settings(BaseSettings):
 settings = Settings()
 
 
+# Skip all workflow tests if we don't have proper GCP configuration
+pytestmark = pytest.mark.skipif(
+    settings.project_id == "UNKNOWN_PROJECT_ID" or 
+    settings.us_model_version == "UNKNOWN_US_MODEL_VERSION" or
+    not os.getenv("GOOGLE_APPLICATION_CREDENTIALS", ""),
+    reason="Workflow tests require GCP credentials and configuration"
+)
+
+
 @pytest.fixture()
 def us_model_version() -> str:
     return settings.us_model_version

projects/policyengine-apis-integ/tests/simulation_workflow/test_calculate.py

@@ -1,7 +1,9 @@
+import pytest
 from .simplified_workflow_client import SimplifiedWorkflowClient
 from google.cloud.workflows.executions_v1.types import executions
 
 
+@pytest.mark.requires_gcp
 def test_calculate_default_model(client: SimplifiedWorkflowClient):
     execution = client.execute(
         argument={
@@ -19,6 +21,7 @@ def test_calculate_default_model(client: SimplifiedWorkflowClient):
     assert execution.state == executions.Execution.State.SUCCEEDED
 
 
+@pytest.mark.requires_gcp
 def test_calculate_specific_model(
     client: SimplifiedWorkflowClient, us_model_version: str
 ):

scripts/test-integration-local.sh

@@ -37,8 +37,11 @@ check_service "api-simulation" 8082
 check_service "api-tagger" 8083
 
 echo ""
-echo "Running integration tests..."
-make test-integration
+echo "Running integration tests (excluding GCP workflow tests)..."
+cd projects/policyengine-apis-integ
+uv sync --extra test
+uv run pytest tests/ -v -m "not requires_gcp"
+cd ../..
 
 echo ""
 echo "Stopping services..."