Different strategy

betodealmeida · Oct 26, 2023 · 8e94795 · 8e94795
1 parent efad596
commit 8e94795
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 11 deletions.
diff --git a/.github/workflows/python-integration.yml b/.github/workflows/python-integration.yml
@@ -39,14 +39,11 @@ jobs:
         pip install .
     - name: Start the Postgres service
       run: |
-        docker-compose -f postgres/docker-compose.yml up --build -d
-    - name: Check if Postgres is ready
-      run: |
-        docker run --network container:postgres_postgres_1 postgres_postgres pg_isready \
-          -h postgres \
-          -p 5432 \
-          -U shillelagh \
-          --timeout=30
+        docker compose -f postgres/docker-compose.yml up --build -d
+        docker compose ps
+        sleep 15
+        docker compose ps
+        until docker run --network container:postgres_postgres_1 postgres_postgres pg_isready -h postgres -p 5432 -U shillelagh --timeout=90; do sleep 10; done
     - name: Test with pytest
       env:
         SHILLELAGH_ADAPTER_KWARGS: ${{ secrets.SHILLELAGH_ADAPTER_KWARGS }}
@@ -55,4 +52,4 @@ jobs:
     - name: Stop the Postgres service
       if: always()
       run: |
-        docker-compose -f postgres/docker-compose.yml down
+        docker compose -f postgres/docker-compose.yml down
diff --git a/postgres/docker-compose.yml b/postgres/docker-compose.yml
@@ -13,7 +13,7 @@ services:
       - ./entrypoint.sh:/usr/local/bin/custom_entrypoint.sh
       - ..:/src
     ports:
-      - "12345:5432"
+      - "5432:5432"
     entrypoint: /usr/local/bin/custom_entrypoint.sh
 
 volumes:

diff --git a/tests/adapters/api/gsheets/integration_test.py b/tests/adapters/api/gsheets/integration_test.py
@@ -768,7 +768,7 @@ def test_public_sheet_multicorn() -> None:
         user="shillelagh",
         password="shillelagh123",
         host="localhost",
-        port=12345,
+        port=5432,
         database="shillelagh",
     )
     cursor = connection.cursor()