forked from pool/python-sortinghat
Steve Kowalik
1d46b71e1d
* Fix "Table 'django_session' doesn't exist" error * Unify identities with same source * Use correct base URL for login and change password API calls (#851) * Display individual's most recent organization * CSRF token is only required on web requests * Link to profile in individual cards (#837) * Open calendar to the side of the date input (#838) * Improved loading time when looking for organizations * Gitdm identities importer * Fix individual page not loading * Recommendations for individuals modified after a given date (#813) * Add individual to workspace from their profile page (#816) * Cache individuals table data (#821) * Strict criteria for merge recommendations (#812) * Text field to update enrollment dates (#819) * Improved organization selector (#820) * API method to create a scheduled task * Manage app settings from the user interface * Remove tasks that fail to be scheduled * Add Python 3.9 and drop 3.7 support * Sub-domain affiliation error (#805) - Refresh patches. - Add patch use-correct-assertion-methods.patch: * Use non-deprecated and non-removed assertion methods. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-sortinghat?expand=0&rev=40
60 lines
2.1 KiB
Diff
60 lines
2.1 KiB
Diff
Index: grimoirelab-sortinghat-0.19.1/config/settings/testing.py
|
|
===================================================================
|
|
--- grimoirelab-sortinghat-0.19.1.orig/config/settings/testing.py
|
|
+++ grimoirelab-sortinghat-0.19.1/config/settings/testing.py
|
|
@@ -1,3 +1,4 @@
|
|
+import os
|
|
import sys
|
|
import logging
|
|
|
|
@@ -38,8 +39,8 @@ SQL_MODE = [
|
|
DATABASES = {
|
|
'default': {
|
|
'ENGINE': 'django.db.backends.mysql',
|
|
- 'USER': 'root',
|
|
- 'PASSWORD': 'root',
|
|
+ 'USER': os.environ.get('TEST_SORTINGHAT_DB_USER', 'root'),
|
|
+ 'PASSWORD': os.environ.get('TEST_SORTINGHAT_DB_PASSWORD', 'root'),
|
|
'NAME': 'sortinghat_db',
|
|
'OPTIONS': {
|
|
'charset': 'utf8mb4',
|
|
@@ -49,9 +50,10 @@ DATABASES = {
|
|
'NAME': 'testhat',
|
|
'CHARSET': 'utf8mb4',
|
|
'COLLATION': 'utf8mb4_unicode_520_ci',
|
|
+ 'MIRROR': False
|
|
},
|
|
'HOST': '127.0.0.1',
|
|
- 'PORT': 3306
|
|
+ 'PORT': os.environ.get('TEST_SORTINGHAT_DB_PORT', 3306)
|
|
}
|
|
}
|
|
|
|
Index: grimoirelab-sortinghat-0.19.1/config/settings/testing_tenant.py
|
|
===================================================================
|
|
--- grimoirelab-sortinghat-0.19.1.orig/config/settings/testing_tenant.py
|
|
+++ grimoirelab-sortinghat-0.19.1/config/settings/testing_tenant.py
|
|
@@ -5,8 +5,8 @@ from .testing import SQL_MODE, DATABASES
|
|
DATABASES.update({
|
|
tenant: {
|
|
'ENGINE': 'django.db.backends.mysql',
|
|
- 'USER': 'root',
|
|
- 'PASSWORD': 'root',
|
|
+ 'USER': os.environ.get('TEST_SORTINGHAT_DB_USER', 'root'),
|
|
+ 'PASSWORD': os.environ.get('TEST_SORTINGHAT_DB_PASSWORD', 'root'),
|
|
'NAME': tenant,
|
|
'OPTIONS': {
|
|
'charset': 'utf8mb4',
|
|
@@ -16,9 +16,10 @@ DATABASES.update({
|
|
'NAME': tenant,
|
|
'CHARSET': 'utf8mb4',
|
|
'COLLATION': 'utf8mb4_unicode_520_ci',
|
|
+ 'MIRROR': False
|
|
},
|
|
'HOST': '127.0.0.1',
|
|
- 'PORT': 3306
|
|
+ 'PORT': os.environ.get('TEST_SORTINGHAT_DB_PORT', 3306)
|
|
}
|
|
for tenant in ['tenant_1', 'tenant_2']
|
|
})
|