aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Allan Webber <cwebber@dustycloud.org>2011-06-19 16:03:13 -0500
committerChristopher Allan Webber <cwebber@dustycloud.org>2011-06-19 16:03:13 -0500
commit668e8c26ad61b0ff1ee1beeb81d729934dd298f7 (patch)
tree8c78c1b6aefce4fe2f6ea105fe23a0427d0d3bc9
parentd45e39664a1e6b9f1448302d5c2c3e12a603ead4 (diff)
downloadmediagoblin-668e8c26ad61b0ff1ee1beeb81d729934dd298f7.tar.lz
mediagoblin-668e8c26ad61b0ff1ee1beeb81d729934dd298f7.tar.xz
mediagoblin-668e8c26ad61b0ff1ee1beeb81d729934dd298f7.zip
Reset the globals parameters while testing parameters
(This way we can be sure that the database is torn down if necessary but this was the only test that passed last.)
-rw-r--r--mediagoblin/tests/test_globals.py31
1 files changed, 20 insertions, 11 deletions
diff --git a/mediagoblin/tests/test_globals.py b/mediagoblin/tests/test_globals.py
index 59d217f3..1acea328 100644
--- a/mediagoblin/tests/test_globals.py
+++ b/mediagoblin/tests/test_globals.py
@@ -16,14 +16,23 @@
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
+
+ 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!'