0001-Parallelize-tests-in-CI-67911.patch

A. Berriot, 03 août 2022 15:03

Voir les différences: en ligne côte à côte

Subject: [PATCH 1/2] Parallelize tests in CI (#67911)

 Jenkinsfile                   |  2 +-
 hobo/test_utils.py            | 19 +++++++++++++++++++
 tests/settings.py             |  7 +++----
 tests_authentic/settings.py   |  7 +++----
 tests_multipublik/settings.py |  6 ++----
 tests_multitenant/settings.py |  7 +++----
 tests_passerelle/settings.py  |  8 ++++----
 tests_schemas/settings.py     |  6 ++++--
 tox.ini                       |  3 ++-
 9 files changed, 41 insertions(+), 24 deletions(-)
 create mode 100644 hobo/test_utils.py

         stages {
             stage('Unit Tests') {
                 steps {
                     sh 'tox -rv'
                     sh 'tox -rv -p 8'
+                }
                 post {
                     always {

     import hashlib
     import os
     def get_safe_db_name(prefix):
         """
         PostgreSQL database name limit is 68 characters, which can become
         an issue during testing, because we need to build a unique
         database name using the branch and tox env.
         Ergo, the following code to ensure the database name is always shorter than 68
         characters.
         """
         BRANCH_NAME = os.environ.get('BRANCH_NAME', '').replace('/', '-')
         TOX_ENV_NAME = os.environ.get('TOX_ENV_NAME')
         DB_NAME = '_'.join([part for part in [prefix, BRANCH_NAME, TOX_ENV_NAME] if part])
         DB_NAME = hashlib.sha256(DB_NAME.encode()).hexdigest()[:10]
         return DB_NAME

     import os
     import hobo.test_utils
     LANGUAGE_CODE = 'en-us'
     BROKER_URL = 'memory://'
-...
+    )
     HOBO_MANAGER_HOMEPAGE_URL_VAR = 'portal_agent_url'
     DATABASES = {
         'default': {
             'ENGINE': os.environ.get('DB_ENGINE', 'django.db.backends.sqlite3'),
             'TEST': {
                 'NAME': ('hobo-test-%s' % os.environ.get("BRANCH_NAME", "").replace('/', '-'))[:63],
             },
             'NAME': hobo.test_utils.get_safe_db_name('test-hobo'),
+        }
+    }

     from mock import mock_open, patch
     import hobo.test_utils
     # Debian defaults
     DEBUG = False
-...
     with patch.object(builtins, 'open', mock_open(read_data=b'xxx')):
         exec(open_backup(os.environ['DEBIAN_CONFIG_COMMON']).read())
     BRANCH_NAME = os.environ.get("BRANCH_NAME", "").replace('/', '-')
     DATABASES['default']['TEST'] = {
         'NAME': (DATABASES['default']['NAME'] + '-%s' % BRANCH_NAME)[:63],
+    }
     DATABASES['default']['NAME'] = hobo.test_utils.get_safe_db_name('test-authentic')
     # Avoid conflic with real tenants
     # that might exist in /var/lib/authentic2_multitenant/tenants

     from mock import mock_open, patch
     import hobo.test_utils
     from hobo.settings import *
     LANGUAGE_CODE = 'en-us'
-...
     with patch.object(builtins, 'open', mock_open(read_data=b'xxx')):
         exec(open_backup(os.path.join(os.path.dirname(__file__), '../debian/debian_config_common.py')).read())
     BRANCH_NAME = os.environ.get("BRANCH_NAME", "").replace('/', '-')
     DATABASES['default']['TEST'] = {
         'NAME': (DATABASES['default']['NAME'] + '-%s' % BRANCH_NAME)[:63],
+    }
     DATABASES['default']['NAME'] = hobo.test_utils.get_safe_db_name('test-multipublik')
     CACHES = {
         'default': {

     from mock import mock_open, patch
     import hobo.test_utils
     LANGUAGE_CODE = 'en-us'
     INSTALLED_APPS = (
-...
     with patch.object(builtins, 'open', mock_open(read_data=b'xxx')):
         exec(open_backup(os.path.join(os.path.dirname(__file__), '../debian/debian_config_common.py')).read())
     BRANCH_NAME = os.environ.get("BRANCH_NAME", "").replace('/', '-')
     DATABASES['default']['TEST'] = {
         'NAME': (DATABASES['default']['NAME'] + '-%s' % BRANCH_NAME)[:63],
+    }
     DATABASES['default']['NAME'] = hobo.test_utils.get_safe_db_name('test-multitenant')
     TENANT_APPS = (
         'django.contrib.auth',

     from mock import mock_open, patch
     import hobo.test_utils
     # Debian defaults
     DEBUG = False
-...
     with patch.object(builtins, 'open', mock_open(read_data=b'xxx')):
         exec(open_backup(os.environ['DEBIAN_CONFIG_COMMON']).read())
     BRANCH_NAME = os.environ.get("BRANCH_NAME", "").replace('/', '-')
     DATABASES['default']['TEST'] = {
         'NAME': (DATABASES['default']['NAME'] + '-%s' % BRANCH_NAME)[:63],
+    }
     BRANCH_NAME = os.environ.get("BRANCH_NAME", "").replace('/', '-')[:15]
     DATABASES['default']['NAME'] = hobo.test_utils.get_safe_db_name('test-passerelle')
     # Avoid conflic with real tenants
     # that might exist in /var/lib/passerelle/tenants

     import os
     import tempfile
     import hobo.test_utils
     TENANT_BASE = tempfile.mkdtemp('hobo-tenant-base')
     TENANT_MODEL = 'multitenant.Tenant'
     MIDDLEWARE = ('hobo.multitenant.middleware.TenantMiddleware',) + MIDDLEWARE
     BRANCH_NAME = (
         os.environ.get("BRANCH_NAME", "").replace('/', '_').replace('-', '_').encode('ascii', 'ignore').decode()
+    )
     )[:15]
     DATABASES = {
         'default': {
             'ENGINE': 'tenant_schemas.postgresql_backend',
             'TEST': {'NAME': ('hobo_test_schemas_' + BRANCH_NAME)[:63]},
             'NAME': hobo.test_utils.get_safe_db_name('test-schemas'),
+        }
+    }
     DATABASE_ROUTERS = ('tenant_schemas.routers.TenantSyncRouter',)

     setenv =
     	DISABLE_GLOBAL_HANDLERS=1
     	BRANCH_NAME={env:BRANCH_NAME:}
     	COVERAGE_FILE={envdir}/coverage
     	DB_ENGINE=django.db.backends.postgresql_psycopg2
     	SETUPTOOLS_USE_DISTUTILS=stdlib
             JUNIT=--junitxml=junit-{envname}.xml
-...
     	passerelle: DEBIAN_CONFIG_COMMON=debian/debian_config_common.py
     	passerelle: PASSERELLE_SETTINGS_FILE=tests_passerelle/settings.py
     	passerelle: DJANGO_SETTINGS_MODULE=passerelle.settings
     	coverage: COVERAGE=--cov-report xml:coverage-{envname}.xml --cov-report html:htmlcov-{envname} --cov=hobo/ --cov-config .coveragerc
     	coverage: COVERAGE=--cov-report xml:coverage-{envname}.xml --cov-report html:htmlcov-{envname} --cov=hobo/ --cov-config .coveragerc
     	fast: NOMIGRATIONS=--nomigrations
     deps:
     	drf39: djangorestframework>=3.9.2,<3.10
+    -

Projet

Général

Profil

Produits Entr'ouvert » Hobo

0001-Parallelize-tests-in-CI-67911.patch