X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=mediagoblin%2Ftests%2Ftest_globals.py;h=fe3088f86e0889854b9d79fb5376e3659ee9f12e;hb=07e61ef13a62752d1321f2e9b6e6ff62d474023c;hp=6d2e01dab8814a09fb906b150593249586192143;hpb=df9809c2098d18b0272c40154b5e40d67b703214;p=mediagoblin.git

diff --git a/mediagoblin/tests/test_globals.py b/mediagoblin/tests/test_globals.py
index 6d2e01da..fe3088f8 100644
--- a/mediagoblin/tests/test_globals.py
+++ b/mediagoblin/tests/test_globals.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
@@ -14,16 +14,29 @@
 # 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
-
-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!'
+import pytest
+
+from mediagoblin import mg_globals
+
+
+class TestGlobals(object):
+    def setup(self):
+        self.old_database = mg_globals.database
+
+    def teardown(self):
+        mg_globals.database = self.old_database
+
+    def test_setup_globals(self):
+        mg_globals.setup_globals(
+            database='my favorite database!',
+            public_store='my favorite public_store!',
+            queue_store='my favorite queue_store!')
+
+        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!'
+
+        pytest.raises(
+            AssertionError,
+            mg_globals.setup_globals,
+            no_such_global_foo="Dummy")