Don't get a fresh app when not needed

[mediagoblin.git] / mediagoblin / tests / test_tests.py

diff --git a/mediagoblin/tests/test_tests.py b/mediagoblin/tests/test_tests.py
index bc5f9a8d956047654a63161d52d2ebdae5d2486f..d09e8f284bc21774427c727a9a69b810d02f09ce 100644 (file)
--- a/mediagoblin/tests/test_tests.py
+++ b/mediagoblin/tests/test_tests.py
@@ -1,5 +1,5 @@
 # GNU MediaGoblin -- federated, autonomous media hosting
-# Copyright (C) 2011 MediaGoblin contributors.  See AUTHORS.
+# 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,25 +14,23 @@
 # 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.tests.tools import get_test_app
-
 from mediagoblin import mg_globals
+from mediagoblin.tests.tools import get_test_app, fixture_add_user
+from mediagoblin.db.models import User
 
 
 def test_get_test_app_wipes_db():
     """
     Make sure we get a fresh database on every wipe :)
     """
-    get_test_app()
-    assert mg_globals.database.User.find().count() == 0
+    get_test_app(dump_old_app=True)
+    assert User.query.count() == 0
 
-    new_user = mg_globals.database.User()
-    new_user['username'] = u'lolcat'
-    new_user['email'] = u'lol@cats.example.org'
-    new_user['pw_hash'] = u'pretend_this_is_a_hash'
-    new_user.save()
-    assert mg_globals.database.User.find().count() == 1
+    fixture_add_user()
+    assert User.query.count() == 1
 
-    get_test_app()
+    get_test_app(dump_old_app=False)
+    assert User.query.count() == 1
 
-    assert mg_globals.database.User.find().count() == 0
+    get_test_app(dump_old_app=True)
+    assert User.query.count() == 0