Skip to content

Test fix #6896

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
phlax wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Test fix #6896

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fb22488
Fail test run after first failure
phlax Apr 13, 2019
5e1caae
Update django-redis version to 4.10.0
phlax Apr 12, 2019
e2a8659
Update db backend settings
phlax Apr 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions docker/dev-mariadb/settings.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# -*- coding: utf-8 -*-
# -*- coding: utf-8 -*-

import os

SECRET_KEY = 'SECRETKEY'
ALLOWED_HOSTS = [
Expand All @@ -9,11 +10,19 @@ ALLOWED_HOSTS = [
]

DATABASES['default']['ENGINE'] = 'django.db.backends.mysql'
DATABASES['default']['NAME'] = 'pootle'
DATABASES['default']['USER'] = 'travis'
DATABASES['default']['NAME'] = 'pootledb'
DATABASES['default']['USER'] = 'pootle'
if os.environ.get("TRAVIS"):
DATABASES['default']['USER'] = 'travis'
DATABASES['default']['HOST'] = 'mariadb'
DATABASES['default']['PASSWORD'] = 'CHANGEME'
DATABASES['default']['TEST'] = dict(
COLLATION='utf8_general_ci',
NAME='',
CHARSET='utf8')
DATABASES['default']['OPTIONS'] = {
'init_command': "SET sql_mode='STRICT_ALL_TABLES'"}

CACHES['default']['LOCATION'] = 'redis://redis:6379/1'
CACHES['redis']['LOCATION'] = 'redis://redis:6379/2'
CACHES['lru']['LOCATION'] = 'redis://redis:6379/3'
12 changes: 11 additions & 1 deletion docker/dev-postgres/settings.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# -*- coding: utf-8 -*-

import os

SECRET_KEY = 'SECRETKEY'
ALLOWED_HOSTS = [
'127.0.0.1',
Expand All @@ -8,5 +10,13 @@ ALLOWED_HOSTS = [
]

DATABASES['default']['ENGINE'] = 'django.db.backends.postgresql'
DATABASES['default']['NAME'] = 'pootle'
DATABASES['default']['NAME'] = 'pootledb'
DATABASES['default']['USER'] = 'postgres'
if os.environ.get("TRAVIS"):
DATABASES['default']['USER'] = 'travis'
DATABASES['default']['HOST'] = 'postgres'
DATABASES['default']['PASSWORD'] = 'CHANGEME'

CACHES['default']['LOCATION'] = 'redis://redis:6379/1'
CACHES['redis']['LOCATION'] = 'redis://redis:6379/2'
CACHES['lru']['LOCATION'] = 'redis://redis:6379/3'
4 changes: 4 additions & 0 deletions docker/dev-sqlite/settings.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,7 @@ ALLOWED_HOSTS = [
'localhost',
#'${your_server}',
]

CACHES['default']['LOCATION'] = 'redis://redis:6379/1'
CACHES['redis']['LOCATION'] = 'redis://redis:6379/2'
CACHES['lru']['LOCATION'] = 'redis://redis:6379/3'
2 changes: 1 addition & 1 deletion requirements/base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ django-bulk-update==2.2.0
django-contact-form==1.5
django-contrib-comments==1.7.3,!=1.8.0 # rq.filter: !=1.8.0
django-overextends==0.4.3
django-redis==4.9.0
django-redis==4.10.0
django-rq==1.0.1
django-sortedm2m==1.5.0
django-statici18n==1.7.0
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool:pytest]
python_files=*.py
addopts=--tb=short --strict
addopts=--tb=short --strict -x
testpaths=tests
norecursedirs=.git _build tmp* requirements commands/*
markers=
Expand Down