Merge remote branch 'remotes/elrond/idea/globals_check'

Conflicts:
	mediagoblin/tests/test_globals.py

diff --cc mediagoblin/mg_globals.py
index 2fca3c0ac1c5cd55d2c12acba09dd048a75070d8,49a513a27733239bc334c3ec9102aa620b10bdba..3d0ed61d33a5c58ee6eb66c79f679279bfbeb4fe
--- 1/mediagoblin/mg_globals.py
--- 2/mediagoblin/globals.py
+++ b/mediagoblin/mg_globals.py
@@@ -27,7 -36,9 +36,9 @@@ translations = gettext.find
  
  
  def setup_globals(**kwargs):
 -    from mediagoblin import globals as mg_globals
 +    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 --cc mediagoblin/tests/test_globals.py
index 1acea3281dba6460f0223057886c5882344355cc,b285cdf5b408868e6aff54f718c4bf3060263a91..63578d621603754efbd230cb45ad6bcb8f1bbca3
--- 1/mediagoblin/tests/test_globals.py
--- 2/mediagoblin/tests/test_globals.py
+++ b/mediagoblin/tests/test_globals.py
@@@ -14,25 -14,23 +14,32 @@@
  # 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 mediagoblin import globals as mg_globals
+ from nose.tools import assert_raises
+ 
 +from mediagoblin import mg_globals
  
 -def test_setup_globals():
 -    mg_globals.setup_globals(
 -        db_connection='my favorite db_connection!',
 -        database='my favorite database!',
 -        public_store='my favorite public_store!',
 -        queue_store='my favorite queue_store!')
 -    
 -    assert mg_globals.db_connection == 'my favorite db_connection!'
 -    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!'
 +class TestGlobals(object):
 +    def setUp(self):
 +        self.old_connection = mg_globals.db_connection
 +        self.old_database = mg_globals.database
  
 -    assert_raises(
 -        AssertionError,
 -        mg_globals.setup_globals,
 -        no_such_global_foo = "Dummy")
 +    def tearDown(self):
 +        mg_globals.db_connection = self.old_connection
 +        mg_globals.database = self.old_database
 +
 +    def test_setup_globals(self):
 +        mg_globals.setup_globals(
 +            db_connection='my favorite db_connection!',
 +            database='my favorite database!',
 +            public_store='my favorite public_store!',
 +            queue_store='my favorite queue_store!')
 +
 +        assert mg_globals.db_connection == 'my favorite db_connection!'
 +        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")