aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/tests/test_collections.py
diff options
context:
space:
mode:
authorChristopher Allan Webber <cwebber@dustycloud.org>2013-04-04 19:23:04 -0500
committerChristopher Allan Webber <cwebber@dustycloud.org>2013-04-04 19:23:04 -0500
commit5c2ece7401723486d76ea0fcd2f99ba4d1002504 (patch)
treea71a2bf9b15bd2805e344362e0bd265d7a124910 /mediagoblin/tests/test_collections.py
parente11c62a0efeb053f71f8ab0793c7399ce8b0758d (diff)
downloadmediagoblin-5c2ece7401723486d76ea0fcd2f99ba4d1002504.tar.lz
mediagoblin-5c2ece7401723486d76ea0fcd2f99ba4d1002504.tar.xz
mediagoblin-5c2ece7401723486d76ea0fcd2f99ba4d1002504.zip
Switch test_app generation over to use py.test fixtures.
By doing this, we can take advantage of py.test's ability to create temporary directories that are then cleaned up later during testing. This helps for sandboxing things. This also involves a ton of changes: - Changing the get_app stuff appropriately, getting rid of the setup_fresh_app decorator - Making said fixture - Switching over a billion tests to use it
Diffstat (limited to 'mediagoblin/tests/test_collections.py')
-rw-r--r--mediagoblin/tests/test_collections.py8
1 files changed, 2 insertions, 6 deletions
diff --git a/mediagoblin/tests/test_collections.py b/mediagoblin/tests/test_collections.py
index b19f6362..d4d3af71 100644
--- a/mediagoblin/tests/test_collections.py
+++ b/mediagoblin/tests/test_collections.py
@@ -14,17 +14,13 @@
# 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 fixture_add_collection, fixture_add_user, \
- get_app
+from mediagoblin.tests.tools import fixture_add_collection, fixture_add_user
from mediagoblin.db.models import Collection, User
-from mediagoblin.db.base import Session
from nose.tools import assert_equal
-def test_user_deletes_collection():
+def test_user_deletes_collection(test_app):
# Setup db.
- get_app(dump_old_app=False)
-
user = fixture_add_user()
coll = fixture_add_collection(user=user)
# Reload into session: