tests/run-tests.py
changeset 21461 a46a91989d57
parent 21460 df580990507e
child 21462 8a4ef661f08d
equal deleted inserted replaced
21460:df580990507e 21461:a46a91989d57
   381     def cleanup(self):
   381     def cleanup(self):
   382         for entry in self._daemonpids:
   382         for entry in self._daemonpids:
   383             killdaemons(entry)
   383             killdaemons(entry)
   384 
   384 
   385         if self._threadtmp and not self._options.keep_tmpdir:
   385         if self._threadtmp and not self._options.keep_tmpdir:
       
   386             # Ignore failures here. The rmtree() in the higher level runner
       
   387             # will try again.
   386             shutil.rmtree(self._threadtmp, True)
   388             shutil.rmtree(self._threadtmp, True)
   387 
   389 
   388     def setUp(self):
   390     def setUp(self):
   389         """Tasks to perform before run()."""
   391         """Tasks to perform before run()."""
   390         self._finished = False
   392         self._finished = False
   523         for entry in self._daemonpids:
   525         for entry in self._daemonpids:
   524             killdaemons(entry)
   526             killdaemons(entry)
   525         self._daemonpids = []
   527         self._daemonpids = []
   526 
   528 
   527         if not self._options.keep_tmpdir:
   529         if not self._options.keep_tmpdir:
   528             shutil.rmtree(self._testtmp)
   530             shutil.rmtree(self._testtmp, True)
   529 
   531 
   530         if (self._ret != 0 or self._out != self._refout) and not self._skipped \
   532         if (self._ret != 0 or self._out != self._refout) and not self._skipped \
   531             and not self._options.debug and self._out:
   533             and not self._options.debug and self._out:
   532             f = open(self._errpath, 'wb')
   534             f = open(self._errpath, 'wb')
   533             for line in self._out:
   535             for line in self._out: