Merge branch 'pytest-2.7'

2015-07-19 15:25:04 +02:00
parent 604a39f5ef 412b43b216
commit 6af7172204
16 changed files with 289 additions and 65 deletions
@@ -52,7 +52,14 @@ class TempdirFactory:
                    basetemp.remove()
                basetemp.mkdir()
            else:
-                basetemp = py.path.local.make_numbered_dir(prefix='pytest-')
+                # use a sub-directory in the temproot to speed-up
+                # make_numbered_dir() call
+                import getpass
+                temproot = py.path.local.get_temproot()
+                rootdir = temproot.join('pytest-%s' % getpass.getuser())
+                rootdir.ensure(dir=1)
+                basetemp = py.path.local.make_numbered_dir(prefix='pytest-',
+                                                           rootdir=rootdir)
            self._basetemp = t = basetemp.realpath()
            self.trace("new basetemp", t)
            return t