Spaces:
Running
Running
Commit ·
92de720
1
Parent(s): 81c4ef1
Updated yml file
Browse files- .github/workflows/build-deploy.yml +11 -2
- tests/conftest.py +1 -2
.github/workflows/build-deploy.yml
CHANGED
|
@@ -7,8 +7,8 @@ jobs:
|
|
| 7 |
environment:
|
| 8 |
name: testing
|
| 9 |
env:
|
| 10 |
-
DATABASE_HOSTNAME:
|
| 11 |
-
DATABASE_PORT:
|
| 12 |
DATABASE_NAME: ${{ secrets.DATABASE_NAME }}_test
|
| 13 |
DATABASE_PASSWORD: ${{ secrets.DATABASE_PASSWORD }}
|
| 14 |
DATABASE_USERNAME: ${{ secrets.DATABASE_USERNAME }}
|
|
@@ -47,5 +47,14 @@ jobs:
|
|
| 47 |
- name: Install dependencies
|
| 48 |
run: pip install -r requirements.txt
|
| 49 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 50 |
- name: Run tests
|
| 51 |
run: pytest
|
|
|
|
| 7 |
environment:
|
| 8 |
name: testing
|
| 9 |
env:
|
| 10 |
+
DATABASE_HOSTNAME: localhost
|
| 11 |
+
DATABASE_PORT: 5432
|
| 12 |
DATABASE_NAME: ${{ secrets.DATABASE_NAME }}_test
|
| 13 |
DATABASE_PASSWORD: ${{ secrets.DATABASE_PASSWORD }}
|
| 14 |
DATABASE_USERNAME: ${{ secrets.DATABASE_USERNAME }}
|
|
|
|
| 47 |
- name: Install dependencies
|
| 48 |
run: pip install -r requirements.txt
|
| 49 |
|
| 50 |
+
- name: Wait for PostgreSQL
|
| 51 |
+
run: |
|
| 52 |
+
until pg_isready -h localhost -p 5432; do
|
| 53 |
+
echo 'waiting for postgres...'
|
| 54 |
+
sleep 1
|
| 55 |
+
done
|
| 56 |
+
env:
|
| 57 |
+
PGPASSWORD: ${{ secrets.DATABASE_PASSWORD }}
|
| 58 |
+
|
| 59 |
- name: Run tests
|
| 60 |
run: pytest
|
tests/conftest.py
CHANGED
|
@@ -9,8 +9,7 @@ from app.oauth2 import Create_Access_Token
|
|
| 9 |
from app.models import Post
|
| 10 |
|
| 11 |
|
| 12 |
-
SQLALCHEMY_DATABASE_URL = f"postgresql://{setting.database_username}:{setting.database_password}@{setting.database_hostname}:{setting.database_port}/{setting.database_name}
|
| 13 |
-
|
| 14 |
engine = create_engine(SQLALCHEMY_DATABASE_URL)
|
| 15 |
TestingSessionMaker = sessionmaker(autoflush=False, autocommit=False, bind=engine)
|
| 16 |
|
|
|
|
| 9 |
from app.models import Post
|
| 10 |
|
| 11 |
|
| 12 |
+
SQLALCHEMY_DATABASE_URL = f"postgresql://{setting.database_username}:{setting.database_password}@{setting.database_hostname}:{setting.database_port}/{setting.database_name}_test"
|
|
|
|
| 13 |
engine = create_engine(SQLALCHEMY_DATABASE_URL)
|
| 14 |
TestingSessionMaker = sessionmaker(autoflush=False, autocommit=False, bind=engine)
|
| 15 |
|