Mercurial Mercurial > mercurial / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/run-tests.py
changeset 21461 a46a91989d57
parent 21460 df580990507e
child 21462 8a4ef661f08d 
--- a/tests/run-tests.py	Sun Apr 20 16:53:49 2014 -0700
+++ b/tests/run-tests.py	Sun Apr 20 16:54:51 2014 -0700
@@ -383,6 +383,8 @@
             killdaemons(entry)
 
         if self._threadtmp and not self._options.keep_tmpdir:
+            # Ignore failures here. The rmtree() in the higher level runner
+            # will try again.
             shutil.rmtree(self._threadtmp, True)
 
     def setUp(self):
@@ -525,7 +527,7 @@
         self._daemonpids = []
 
         if not self._options.keep_tmpdir:
-            shutil.rmtree(self._testtmp)
+            shutil.rmtree(self._testtmp, True)
 
         if (self._ret != 0 or self._out != self._refout) and not self._skipped \
             and not self._options.debug and self._out:
mercurial