From 9ae05b0ff7c6152e5c424b238c4f358fe1e02cd4 Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Thu, 7 Feb 2019 14:17:20 +0100 Subject: [PATCH] tests: run tests with postgres (#30458) --- tests/settings.py | 57 ++++++++++++++++++++++++++++------------------- tox.ini | 5 ++++- 2 files changed, 38 insertions(+), 24 deletions(-) diff --git a/tests/settings.py b/tests/settings.py index ab97d3e..edf75a4 100644 --- a/tests/settings.py +++ b/tests/settings.py @@ -1,3 +1,5 @@ +import os + LANGUAGE_CODE = 'en-us' TIME_ZONE = 'UTC' @@ -13,29 +15,29 @@ KNOWN_SERVICES = { # include all contrib apps INSTALLED_APPS += ( - 'passerelle.contrib.adict', - 'passerelle.contrib.agoraplus', - 'passerelle.contrib.dpark', - 'passerelle.contrib.fake_family', - 'passerelle.contrib.gdema', - 'passerelle.contrib.grandlyon_streetsections', - 'passerelle.contrib.greco', - 'passerelle.contrib.grenoble_gru', - 'passerelle.contrib.iparapheur', - 'passerelle.contrib.iws', - 'passerelle.contrib.maarch', - 'passerelle.contrib.mdel', - 'passerelle.contrib.meyzieu_newsletters', - 'passerelle.contrib.nancypoll', - 'passerelle.contrib.planitech', - 'passerelle.contrib.seisin_by_email', - 'passerelle.contrib.solis_apa', - 'passerelle.contrib.strasbourg_eu', - 'passerelle.contrib.stub_invoices', - 'passerelle.contrib.teamnet_axel', - 'passerelle.contrib.tlmcom', - 'passerelle.contrib.tcl', - ) + 'passerelle.contrib.adict', + 'passerelle.contrib.agoraplus', + 'passerelle.contrib.dpark', + 'passerelle.contrib.fake_family', + 'passerelle.contrib.gdema', + 'passerelle.contrib.grandlyon_streetsections', + 'passerelle.contrib.greco', + 'passerelle.contrib.grenoble_gru', + 'passerelle.contrib.iparapheur', + 'passerelle.contrib.iws', + 'passerelle.contrib.maarch', + 'passerelle.contrib.mdel', + 'passerelle.contrib.meyzieu_newsletters', + 'passerelle.contrib.nancypoll', + 'passerelle.contrib.planitech', + 'passerelle.contrib.seisin_by_email', + 'passerelle.contrib.solis_apa', + 'passerelle.contrib.strasbourg_eu', + 'passerelle.contrib.stub_invoices', + 'passerelle.contrib.teamnet_axel', + 'passerelle.contrib.tlmcom', + 'passerelle.contrib.tcl', +) # enable applications that are otherwise disabled PASSERELLE_APP_BDP_ENABLED = True @@ -54,3 +56,12 @@ CACHES = { 'BACKEND': 'django.core.cache.backends.dummy.DummyCache' } } + +DATABASES = { + 'default': { + 'ENGINE': os.environ.get('DB_ENGINE', 'django.db.backends.sqlite3'), + 'TEST': { + 'NAME': 'a2-test-%s' % os.environ.get("BRANCH_NAME", "").replace('/', '-'), + }, + } +} diff --git a/tox.ini b/tox.ini index ba9ca87..d795ed1 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] toxworkdir = {env:TMPDIR:/tmp}/tox-{env:USER}/passerelle/{env:BRANCH_NAME:} -envlist = django{18,111} +envlist = django{18,111}-{sqlite,pg} [testenv] usedevelop = True @@ -9,9 +9,12 @@ setenv = DJANGO_SETTINGS_MODULE=passerelle.settings PASSERELLE_SETTINGS_FILE=tests/settings.py fast: FAST=--nomigrations + sqlite: DB_ENGINE=django.db.backends.sqlite3 + pg: DB_ENGINE=django.db.backends.postgresql_psycopg2 deps = django18: django>=1.8,<1.9 django111: django>=1.11,<1.12 + pg: psycopg2-binary pytest-cov pytest-django<3.4.6 pytest -- 2.20.1