heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed tests

Browse Source 
- Adapt tests to new global_config arg for run_dbupdate
- Account for [plugins] not being set in config
This commit is contained in:
Joar Wandborg 2012-09-15 17:54:34 +02:00
parent 999f91eb8a
commit 30520c92cc
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mediagoblin/db/sql/open.py
View File

@ -56,7 +56,7 @@ def load_models(app_config):
_log.debug("Loading %s.models", media_type) _log.debug("Loading %s.models", media_type)
__import__(media_type + ".models") __import__(media_type + ".models")
for plugin in mg_globals.global_config['plugins'].keys(): for plugin in mg_globals.global_config.get('plugins', {}).keys():
_log.debug("Loading %s.models", plugin) _log.debug("Loading %s.models", plugin)
try: try:
__import__(plugin + ".models") __import__(plugin + ".models")

2
mediagoblin/gmg_commands/dbupdate.py
View File

@ -111,7 +111,7 @@ def run_dbupdate(app_config, global_config):
# Gather information from all media managers / projects # Gather information from all media managers / projects
dbdatas = gather_database_data( dbdatas = gather_database_data(
app_config['media_types'], app_config['media_types'],
global_config['plugins'].keys()) global_config.get('plugins', {}).keys())
# Set up the database # Set up the database
connection, db = setup_connection_and_db_from_config(app_config) connection, db = setup_connection_and_db_from_config(app_config)

2
mediagoblin/tests/tools.py
View File

@ -134,7 +134,7 @@ def get_test_app(dump_old_app=True):
app_config = global_config['mediagoblin'] app_config = global_config['mediagoblin']
# Run database setup/migrations # Run database setup/migrations
run_dbupdate(app_config) run_dbupdate(app_config, global_config)
# setup app and return # setup app and return
test_app = loadapp( test_app = loadapp(