From 1e121006c6822ce056e5c5c5afe41ea45a562017 Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Tue, 12 Mar 2019 19:17:19 +0100 Subject: [PATCH 1/2] use BRANCH_NAME for naming test databases (#31337) --- tests_authentic/settings.py | 5 +++++ tests_multipublik/settings.py | 5 +++++ tests_multitenant/settings.py | 5 +++++ tests_passerelle/settings.py | 5 +++++ tox.ini | 1 + 5 files changed, 21 insertions(+) diff --git a/tests_authentic/settings.py b/tests_authentic/settings.py index b3126ea..36d8815 100644 --- a/tests_authentic/settings.py +++ b/tests_authentic/settings.py @@ -12,6 +12,11 @@ PROJECT_NAME = 'authentic2-multitenant' with patch.object(builtin, 'file', mock_open(read_data='xxx')): execfile(os.environ['DEBIAN_CONFIG_COMMON']) +BRANCH_NAME = os.environ.get("BRANCH_NAME", "").replace('/', '-') +DATABASES['default']['TEST'] = { + 'NAME': DATABASES['default']['NAME'] + '-%s' % BRANCH_NAME, +} + # Avoid conflic with real tenants # that might exist in /var/lib/authentic2_multitenant/tenants TENANT_BASE = '/that/path/does/not/exist' diff --git a/tests_multipublik/settings.py b/tests_multipublik/settings.py index 5cb16ff..3251c24 100644 --- a/tests_multipublik/settings.py +++ b/tests_multipublik/settings.py @@ -11,6 +11,11 @@ PROJECT_NAME = 'multipublik' with patch.object(builtin, 'file', mock_open(read_data='xxx')): execfile(os.path.join(os.path.dirname(__file__), '../debian/debian_config_common.py')) +BRANCH_NAME = os.environ.get("BRANCH_NAME", "").replace('/', '-') +DATABASES['default']['TEST'] = { + 'NAME': DATABASES['default']['NAME'] + '-%s' % BRANCH_NAME, +} + CACHES = { 'default': { 'BACKEND': 'hobo.multitenant.cache.TenantCache', diff --git a/tests_multitenant/settings.py b/tests_multitenant/settings.py index 239bdf3..20af7a7 100644 --- a/tests_multitenant/settings.py +++ b/tests_multitenant/settings.py @@ -43,6 +43,11 @@ TEMPLATES = [ with patch.object(builtin, 'file', mock_open(read_data='xxx')): execfile(os.path.join(os.path.dirname(__file__), '../debian/debian_config_common.py')) +BRANCH_NAME = os.environ.get("BRANCH_NAME", "").replace('/', '-') +DATABASES['default']['TEST'] = { + 'NAME': DATABASES['default']['NAME'] + '-%s' % BRANCH_NAME, +} + TENANT_APPS = ('django.contrib.auth', 'django.contrib.sessions', 'django.contrib.contenttypes', 'hobo.agent.common', 'mellon') diff --git a/tests_passerelle/settings.py b/tests_passerelle/settings.py index a688f9b..8abe287 100644 --- a/tests_passerelle/settings.py +++ b/tests_passerelle/settings.py @@ -14,6 +14,11 @@ PROJECT_NAME = 'passerelle' with patch.object(builtin, 'file', mock_open(read_data='xxx')): execfile(os.environ['DEBIAN_CONFIG_COMMON']) +BRANCH_NAME = os.environ.get("BRANCH_NAME", "").replace('/', '-') +DATABASES['default']['TEST'] = { + 'NAME': DATABASES['default']['NAME'] + '-%s' % BRANCH_NAME, +} + # Avoid conflic with real tenants # that might exist in /var/lib/passerelle/tenants TENANT_BASE = '/that/path/does/not/exist' diff --git a/tox.ini b/tox.ini index f2303ad..e14d1d1 100644 --- a/tox.ini +++ b/tox.ini @@ -12,6 +12,7 @@ whitelist_externals = /bin/mv usedevelop = True setenv = + BRANCH_NAME={env:BRANCH_NAME:} hobo: DJANGO_SETTINGS_MODULE=hobo.settings hobo: HOBO_SETTINGS_FILE=tests/settings.py multitenant: PYTHONPATH=tests_multitenant -- 2.20.1