forked from pool/python-sortinghat
Dirk Mueller
a9ed3e7caa
* Less distracting main identity indicator * Redirect to the original URL after log in * Merge organizations when adding an alias * Customizable trusted sources for username matching * Users permissions migrated (#849) * Update workspace when identities are split (#919) - update to 1.3.0: * Remove merge recommendations (#883) * Merge organizations when adding an alias (#913) * User permissions per tenant * The link to an individual's GitHub profile no longer appears several times when there is more than one GitHub identity. * Connection closed when job is executed - drop add-missing-format-calls.patch (obsolete) - Update to version 0.7.23 - Update to version 0.7.22 - Update to version 0.7.21 - Update to version 0.7.20 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-sortinghat?expand=0&rev=44
60 lines
2.1 KiB
Diff
60 lines
2.1 KiB
Diff
Index: grimoirelab-sortinghat-1.2.1/config/settings/config_testing.py
|
|
===================================================================
|
|
--- grimoirelab-sortinghat-1.2.1.orig/config/settings/config_testing.py
|
|
+++ grimoirelab-sortinghat-1.2.1/config/settings/config_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-1.2.1/config/settings/config_testing_tenant.py
|
|
===================================================================
|
|
--- grimoirelab-sortinghat-1.2.1.orig/config/settings/config_testing_tenant.py
|
|
+++ grimoirelab-sortinghat-1.2.1/config/settings/config_testing_tenant.py
|
|
@@ -15,8 +15,8 @@ TENANTS_DEDICATED_QUEUES = [t["name"] fo
|
|
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',
|
|
@@ -26,9 +26,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 [t["name"] for t in tenants_cfg]
|
|
})
|