diff options
author | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-06-19 16:22:41 -0500 |
---|---|---|
committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-06-19 16:22:41 -0500 |
commit | d802498a2c6dce27af602f8b0affad376a219191 (patch) | |
tree | 2094935c734b188bb856efde529e4b78ab6bab6b | |
parent | 668e8c26ad61b0ff1ee1beeb81d729934dd298f7 (diff) | |
parent | 49285baf2755e4cead741dd5c615a65736a5dc08 (diff) | |
download | mediagoblin-d802498a2c6dce27af602f8b0affad376a219191.tar.lz mediagoblin-d802498a2c6dce27af602f8b0affad376a219191.tar.xz mediagoblin-d802498a2c6dce27af602f8b0affad376a219191.zip |
Merge remote branch 'remotes/elrond/idea/globals_check'
Conflicts:
mediagoblin/tests/test_globals.py
-rw-r--r-- | mediagoblin/mg_globals.py | 11 | ||||
-rw-r--r-- | mediagoblin/tests/test_globals.py | 7 |
2 files changed, 18 insertions, 0 deletions
diff --git a/mediagoblin/mg_globals.py b/mediagoblin/mg_globals.py index 2fca3c0a..3d0ed61d 100644 --- a/mediagoblin/mg_globals.py +++ b/mediagoblin/mg_globals.py @@ -19,6 +19,15 @@ database = None public_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 translations = gettext.find( 'mediagoblin', @@ -30,4 +39,6 @@ def setup_globals(**kwargs): from mediagoblin import mg_globals for key, value in kwargs.iteritems(): + if not hasattr(mg_globals, key): + raise AssertionError("Global %s not known" % key) setattr(mg_globals, key, value) diff --git a/mediagoblin/tests/test_globals.py b/mediagoblin/tests/test_globals.py index 1acea328..63578d62 100644 --- a/mediagoblin/tests/test_globals.py +++ b/mediagoblin/tests/test_globals.py @@ -14,6 +14,8 @@ # 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/>. +from nose.tools import assert_raises + from mediagoblin import mg_globals class TestGlobals(object): @@ -36,3 +38,8 @@ class TestGlobals(object): assert mg_globals.database == 'my favorite database!' assert mg_globals.public_store == 'my favorite public_store!' assert mg_globals.queue_store == 'my favorite queue_store!' + + assert_raises( + AssertionError, + mg_globals.setup_globals, + no_such_global_foo = "Dummy") |