Merge remote branch 'remotes/elrond/idea/globals_check'
Conflicts: mediagoblin/tests/test_globals.py
This commit is contained in:
commit
d802498a2c
@ -19,6 +19,15 @@ database = None
|
|||||||
public_store = None
|
public_store = None
|
||||||
queue_store = None
|
queue_store = None
|
||||||
|
|
||||||
|
# Dump mail to stdout instead of sending it:
|
||||||
|
email_debug_mode = False
|
||||||
|
|
||||||
|
# Address for sending out mails
|
||||||
|
email_sender_address = None
|
||||||
|
|
||||||
|
# A WorkBenchManager
|
||||||
|
workbench_manager = None
|
||||||
|
|
||||||
# gettext
|
# gettext
|
||||||
translations = gettext.find(
|
translations = gettext.find(
|
||||||
'mediagoblin',
|
'mediagoblin',
|
||||||
@ -30,4 +39,6 @@ def setup_globals(**kwargs):
|
|||||||
from mediagoblin import mg_globals
|
from mediagoblin import mg_globals
|
||||||
|
|
||||||
for key, value in kwargs.iteritems():
|
for key, value in kwargs.iteritems():
|
||||||
|
if not hasattr(mg_globals, key):
|
||||||
|
raise AssertionError("Global %s not known" % key)
|
||||||
setattr(mg_globals, key, value)
|
setattr(mg_globals, key, value)
|
||||||
|
@ -14,6 +14,8 @@
|
|||||||
# You should have received a copy of the GNU Affero General Public License
|
# You should have received a copy of the GNU Affero General Public License
|
||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
from nose.tools import assert_raises
|
||||||
|
|
||||||
from mediagoblin import mg_globals
|
from mediagoblin import mg_globals
|
||||||
|
|
||||||
class TestGlobals(object):
|
class TestGlobals(object):
|
||||||
@ -36,3 +38,8 @@ class TestGlobals(object):
|
|||||||
assert mg_globals.database == 'my favorite database!'
|
assert mg_globals.database == 'my favorite database!'
|
||||||
assert mg_globals.public_store == 'my favorite public_store!'
|
assert mg_globals.public_store == 'my favorite public_store!'
|
||||||
assert mg_globals.queue_store == 'my favorite queue_store!'
|
assert mg_globals.queue_store == 'my favorite queue_store!'
|
||||||
|
|
||||||
|
assert_raises(
|
||||||
|
AssertionError,
|
||||||
|
mg_globals.setup_globals,
|
||||||
|
no_such_global_foo = "Dummy")
|
||||||
|
Loading…
x
Reference in New Issue
Block a user