diff options
| author | Joar Wandborg <git@wandborg.com> | 2012-09-15 17:54:34 +0200 |
|---|---|---|
| committer | Joar Wandborg <git@wandborg.com> | 2012-09-15 17:54:34 +0200 |
| commit | 30520c92cc621bd0826259aca3d9b7b740f71ef0 (patch) | |
| tree | 48cb9b4c7f028c9e64e4464fca09ea30c34a9e02 | |
| parent | 999f91eb8a220ee9a69c0678aa2803c63e80c903 (diff) | |
| download | mediagoblin-30520c92cc621bd0826259aca3d9b7b740f71ef0.tar.lz mediagoblin-30520c92cc621bd0826259aca3d9b7b740f71ef0.tar.xz mediagoblin-30520c92cc621bd0826259aca3d9b7b740f71ef0.zip | |
Fixed tests
- Adapt tests to new global_config arg for run_dbupdate
- Account for [plugins] not being set in config
| -rw-r--r-- | mediagoblin/db/sql/open.py | 2 | ||||
| -rw-r--r-- | mediagoblin/gmg_commands/dbupdate.py | 2 | ||||
| -rw-r--r-- | mediagoblin/tests/tools.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/mediagoblin/db/sql/open.py b/mediagoblin/db/sql/open.py index 95691b2c..9db21c56 100644 --- 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 12329b54..67fdd69c 100644 --- 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 a40569e4..6fd11fc2 100644 --- 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( |