/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/script.py

  • Committer: Vincent Ladeuil
  • Date: 2009-09-19 22:22:48 UTC
  • mfrom: (4707.1.1 tiger-regressions)
  • mto: This revision was merged to the branch mainline in revision 4708.
  • Revision ID: v.ladeuil+lp@free.fr-20090919222248-zeqz8sjyd6fu965a
https://launchpad.net/bugs/433120
Fix some test regressions on OSX and FreeBSD

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/script.py
349
349
            try:
350
350
                os.remove(p)
351
351
            except OSError, e:
352
 
                if e.errno == errno.EISDIR:
 
352
                # Various OSes raises different exceptions (linux: EISDIR,
 
353
                #   win32: EACCES, OSX: EPERM) when invoked on a directory
 
354
                if e.errno in (errno.EISDIR, errno.EPERM, errno.EACCES):
353
355
                    if recursive:
354
356
                        osutils.rmtree(p)
355
357
                    else: