Mirroristas/bigchaindb
2
0
Fork 0
mirror of https://github.com/bigchaindb/bigchaindb.git synced 2024-10-13 13:34:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup configuration keys for db

Browse Source
This commit is contained in:
vrde 2017-04-04 18:58:34 +02:00
parent 1e07a5b111
commit 5d2f66524c
No known key found for this signature in database
GPG Key ID: 6581C7C39B3D397D
2 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
bigchaindb/__init__.py
View File

@ -17,7 +17,10 @@ _base_database_rethinkdb = {
# _base_database_rethinkdb.keys() or _base_database_mongodb.keys() # _base_database_rethinkdb.keys() or _base_database_mongodb.keys()
# because dicts are unordered. I tried to configure # because dicts are unordered. I tried to configure
_base_database_rethinkdb_keys = ('host', 'port', 'name') _database_keys_map = {
'mongodb': ('host', 'port', 'name', 'replicaset'),
'rethinkdb': ('host', 'port', 'name')
}
_base_database_mongodb = { _base_database_mongodb = {
'host': os.environ.get('BIGCHAINDB_DATABASE_HOST', 'localhost'), 'host': os.environ.get('BIGCHAINDB_DATABASE_HOST', 'localhost'),
@ -29,9 +32,6 @@ _base_database_mongodb = {
'password': os.environ.get('BIGCHAINDB_DATABASE_PASSWORD') 'password': os.environ.get('BIGCHAINDB_DATABASE_PASSWORD')
} }
_base_database_mongodb_keys = ('host', 'port', 'name', 'replicaset',
'ssl', 'login', 'password')
_database_rethinkdb = { _database_rethinkdb = {
'backend': os.environ.get('BIGCHAINDB_DATABASE_BACKEND', 'rethinkdb'), 'backend': os.environ.get('BIGCHAINDB_DATABASE_BACKEND', 'rethinkdb'),
'connection_timeout': 5000, 'connection_timeout': 5000,
@ -46,11 +46,6 @@ _database_mongodb = {
} }
_database_mongodb.update(_base_database_mongodb) _database_mongodb.update(_base_database_mongodb)
_database_keys_map = {
'mongodb': _base_database_mongodb_keys,
'rethinkdb': _base_database_rethinkdb_keys
}
_database_map = { _database_map = {
'mongodb': _database_mongodb, 'mongodb': _database_mongodb,
'rethinkdb': _database_rethinkdb 'rethinkdb': _database_rethinkdb

10
tests/test_config_utils.py
View File

@ -11,7 +11,6 @@ ORIGINAL_CONFIG = copy.deepcopy(bigchaindb._config)
@pytest.fixture(scope='function', autouse=True) @pytest.fixture(scope='function', autouse=True)
def clean_config(monkeypatch, request): def clean_config(monkeypatch, request):
import bigchaindb import bigchaindb
original_config = copy.deepcopy(ORIGINAL_CONFIG) original_config = copy.deepcopy(ORIGINAL_CONFIG)
backend = request.config.getoption('--database-backend') backend = request.config.getoption('--database-backend')
@ -19,15 +18,6 @@ def clean_config(monkeypatch, request):
monkeypatch.setattr('bigchaindb.config', original_config) monkeypatch.setattr('bigchaindb.config', original_config)
def test_ordered_keys_match_database_config():
import bigchaindb
assert set(bigchaindb._base_database_rethinkdb.keys()) ==\
set(bigchaindb._base_database_rethinkdb_keys)
assert set(bigchaindb._base_database_mongodb.keys()) ==\
set(bigchaindb._base_database_mongodb_keys)
def test_bigchain_instance_is_initialized_when_conf_provided(request): def test_bigchain_instance_is_initialized_when_conf_provided(request):
import bigchaindb import bigchaindb
from bigchaindb import config_utils from bigchaindb import config_utils