Kill MultiRemoteStaticDirect... nobody was really using it anyway

[mediagoblin.git] / mediagoblin / tests / test_config.py

diff --git a/mediagoblin/tests/test_config.py b/mediagoblin/tests/test_config.py
index 244f05e5d4f32b3116b7257987135ed207a88b00..7d8c65c1b1e042b02e01a7481949c690e1fc1576 100644 (file)
--- a/mediagoblin/tests/test_config.py
+++ b/mediagoblin/tests/test_config.py
@@ -1,5 +1,5 @@
 # GNU MediaGoblin -- federated, autonomous media hosting
-# Copyright (C) 2011 Free Software Foundation, Inc
+# Copyright (C) 2011, 2012 MediaGoblin contributors.  See AUTHORS.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
@@ -16,7 +16,7 @@
 
 import pkg_resources
 
-from mediagoblin import config
+from mediagoblin.init import config
 
 
 CARROT_CONF_GOOD = pkg_resources.resource_filename(
@@ -37,7 +37,7 @@ def test_read_mediagoblin_config():
     assert this_conf['carrotapp']['carrotcake'] == False
     assert this_conf['carrotapp']['num_carrots'] == 1
     assert not this_conf['carrotapp'].has_key('encouragement_phrase')
-    assert this_conf['celery']['eat_celery_with_carrots'] == True
+    assert this_conf['celery']['EAT_CELERY_WITH_CARROTS'] == True
 
     # A good file
     this_conf, validation_results = config.read_mediagoblin_config(
@@ -48,7 +48,7 @@ def test_read_mediagoblin_config():
     assert this_conf['carrotapp']['encouragement_phrase'] == \
         "I'd love it if you eat your carrots!"
     assert this_conf['carrotapp']['blah_blah'] == "blah!"
-    assert this_conf['celery']['eat_celery_with_carrots'] == False
+    assert this_conf['celery']['EAT_CELERY_WITH_CARROTS'] == False
 
     # A bad file
     this_conf, validation_results = config.read_mediagoblin_config(
@@ -61,7 +61,7 @@ def test_read_mediagoblin_config():
     assert this_conf['carrotapp']['encouragement_phrase'] == \
         "586956856856"
     assert this_conf['carrotapp']['blah_blah'] == "blah!"
-    assert this_conf['celery']['eat_celery_with_carrots'] == "pants"
+    assert this_conf['celery']['EAT_CELERY_WITH_CARROTS'] == "pants"
 
 
 def test_generate_validation_report():
@@ -89,7 +89,7 @@ There were validation problems loading this config file:
     expected_warnings = [
         'carrotapp:carrotcake = the value "slobber" is of the wrong type.',
         'carrotapp:num_carrots = the value "GROSS" is of the wrong type.',
-        'celery:eat_celery_with_carrots = the value "pants" is of the wrong type.']
+        'celery:EAT_CELERY_WITH_CARROTS = the value "pants" is of the wrong type.']
     warnings = report.splitlines()[2:]
 
     assert len(warnings) == 3