Fixed tests

- Adapt tests to new global_config arg for run_dbupdate
- Account for [plugins] not being set in config

diff --git a/mediagoblin/db/sql/open.py b/mediagoblin/db/sql/open.py
index 95691b2c43b1f42db8d738f07bea13a2ebb12496..9db21c56317733a28875b266138e2084410406ad 100644 (file)
--- a/mediagoblin/db/sql/open.py
+++ b/mediagoblin/db/sql/open.py
@@ -56,7 +56,7 @@ def load_models(app_config):
         _log.debug("Loading %s.models", media_type)
         __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)
         try:
             __import__(plugin + ".models")

diff --git a/mediagoblin/gmg_commands/dbupdate.py b/mediagoblin/gmg_commands/dbupdate.py
index 12329b547b155b384c8b14233538dc4f56fa35b1..67fdd69c7e0855058f694d7d8607c26b6bbbd97b 100644 (file)
--- a/mediagoblin/gmg_commands/dbupdate.py
+++ b/mediagoblin/gmg_commands/dbupdate.py
@@ -111,7 +111,7 @@ def run_dbupdate(app_config, global_config):
     # Gather information from all media managers / projects
     dbdatas = gather_database_data(
             app_config['media_types'],
-            global_config['plugins'].keys())
+            global_config.get('plugins', {}).keys())
 
     # Set up the database
     connection, db = setup_connection_and_db_from_config(app_config)

diff --git a/mediagoblin/tests/tools.py b/mediagoblin/tests/tools.py
index a40569e417f339c71e7847e426b68917d11d2361..6fd11fc2843cd1c19adf4e50155d2e4e2d4fa2aa 100644 (file)
--- a/mediagoblin/tests/tools.py
+++ b/mediagoblin/tests/tools.py
@@ -134,7 +134,7 @@ def get_test_app(dump_old_app=True):
     app_config = global_config['mediagoblin']
 
     # Run database setup/migrations
-    run_dbupdate(app_config)
+    run_dbupdate(app_config, global_config)
 
     # setup app and return
     test_app = loadapp(