merge with trunk

tests/util.py

@@ -184,9 +184,9 @@ def gen_with_app(*args, **kwargs):
 
 
 def with_tempdir(func):
-    def new_func():
+    def new_func(*args, **kwds):
         tempdir = path(tempfile.mkdtemp())
-        func(tempdir)
+        func(tempdir, *args, **kwds)
         tempdir.rmtree()
     new_func.__name__ = func.__name__
     return new_func