Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
funkwhale
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
wxcafé
funkwhale
Commits
c7636c95
Verified
Commit
c7636c95
authored
7 years ago
by
Eliot Berriot
Browse files
Options
Downloads
Patches
Plain Diff
Now use postgres in tests
parent
8ad33786
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.gitlab-ci.yml
+4
-1
4 additions, 1 deletion
.gitlab-ci.yml
api/config/settings/test.py
+0
-6
0 additions, 6 deletions
api/config/settings/test.py
api/test.yml
+15
-8
15 additions, 8 deletions
api/test.yml
with
19 additions
and
15 deletions
.gitlab-ci.yml
+
4
−
1
View file @
c7636c95
...
...
@@ -11,11 +11,14 @@ stages:
-
deploy
test_api
:
services
:
-
postgres:9.4
stage
:
test
image
:
funkwhale/funkwhale:base
variables
:
PIP_CACHE_DIR
:
"
$CI_PROJECT_DIR/pip-cache"
DATABASE_URL
:
"
sqlite://"
DATABASE_URL
:
"
postgresql://postgres@postgres/postgres"
before_script
:
-
python3 -m venv --copies virtualenv
-
source virtualenv/bin/activate
...
...
This diff is collapsed.
Click to expand it.
api/config/settings/test.py
+
0
−
6
View file @
c7636c95
from
.common
import
*
# noqa
SECRET_KEY
=
env
(
"
DJANGO_SECRET_KEY
"
,
default
=
'
test
'
)
DATABASES
=
{
'
default
'
:
{
'
ENGINE
'
:
'
django.db.backends.sqlite3
'
,
'
NAME
'
:
'
:memory:
'
,
}
}
# Mail settings
# ------------------------------------------------------------------------------
...
...
This diff is collapsed.
Click to expand it.
api/test.yml
+
15
−
8
View file @
c7636c95
test
:
dockerfile
:
docker/Dockerfile.test
build
:
.
command
:
pytest
volumes
:
-
.:/app
environment
:
-
"
DATABASE_URL=sqlite://"
version
:
'
2'
services
:
test
:
build
:
dockerfile
:
docker/Dockerfile.test
context
:
.
command
:
pytest
depends_on
:
-
postgres
volumes
:
-
.:/app
environment
:
-
"
DATABASE_URL=postgresql://postgres@postgres/postgres"
postgres
:
image
:
postgres
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment