aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornattily pigeonfowl <nattilypigeonfowl@gmail.com>2013-04-16 16:28:04 -0400
committernattily pigeonfowl <nattilypigeonfowl@gmail.com>2013-04-16 16:28:04 -0400
commitd83f214b715c256fa549708ba9fd0fc07ce1524e (patch)
treed22d2ddd68a1b98f838e1b3b820ef10ab7f5a7fd
parenta2d94b0cca36e5e1442dc26f005afb57f2efb7a1 (diff)
parentd38e9779dd1a367934e5baa415a6aa326e5e9e03 (diff)
downloadmediagoblin-d83f214b715c256fa549708ba9fd0fc07ce1524e.tar.lz
mediagoblin-d83f214b715c256fa549708ba9fd0fc07ce1524e.tar.xz
mediagoblin-d83f214b715c256fa549708ba9fd0fc07ce1524e.zip
Updating branch...
Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin into ticket-660
-rw-r--r--mediagoblin/tests/test_timesince.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/mediagoblin/tests/test_timesince.py b/mediagoblin/tests/test_timesince.py
index 1f8a082b..6579eb09 100644
--- a/mediagoblin/tests/test_timesince.py
+++ b/mediagoblin/tests/test_timesince.py
@@ -19,7 +19,7 @@ from datetime import datetime, timedelta
from mediagoblin.tools.timesince import is_aware, timesince
-def test_timesince(test_app):
+def test_timesince():
test_time = datetime.now()
# it should ignore second and microseconds