aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/tests/test_modelmethods.py
diff options
context:
space:
mode:
authorChristopher Allan Webber <cwebber@dustycloud.org>2013-04-03 14:05:42 -0500
committerChristopher Allan Webber <cwebber@dustycloud.org>2013-04-03 14:05:42 -0500
commit958080be1673bc654adad03abc93a2d7d05c1386 (patch)
tree538d56be4e21170ecddd8ba8b154e1badd87544c /mediagoblin/tests/test_modelmethods.py
parentd9f61cf7d746b71c3e45e4d6a9836443002ebb86 (diff)
downloadmediagoblin-958080be1673bc654adad03abc93a2d7d05c1386.tar.lz
mediagoblin-958080be1673bc654adad03abc93a2d7d05c1386.tar.xz
mediagoblin-958080be1673bc654adad03abc93a2d7d05c1386.zip
All mediagoblin tests now pass with py.test (switched setUp to setup)
Diffstat (limited to 'mediagoblin/tests/test_modelmethods.py')
-rw-r--r--mediagoblin/tests/test_modelmethods.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/mediagoblin/tests/test_modelmethods.py b/mediagoblin/tests/test_modelmethods.py
index 7719bd97..18f90bdc 100644
--- a/mediagoblin/tests/test_modelmethods.py
+++ b/mediagoblin/tests/test_modelmethods.py
@@ -35,7 +35,7 @@ UUID_MOCK = mock.Mock(return_value=FakeUUID())
class TestMediaEntrySlugs(object):
- def setUp(self):
+ def setup(self):
self.test_app = get_app(dump_old_app=True)
self.chris_user = fixture_add_user(u'chris')
self.emily_user = fixture_add_user(u'emily')