/breezy/unstable

To get this branch, use:
bzr branch https://code.breezy-vcs.org/breezy/unstable

« back to all changes in this revision

Viewing changes to breezy/transport/fakenfs.py

  • Committer: Jelmer Vernooij
  • Date: 2017-05-24 01:39:33 UTC
  • mfrom: (3815.3776.6)
  • Revision ID: jelmer@jelmer.uk-20170524013933-ir4y4tqtrsiz2ka2
New upstream snapshot.

Show diffs side-by-side

added added

removed removed

Lines of Context:
26
26
 
27
27
from stat import S_ISDIR
28
28
 
29
 
from bzrlib import (
 
29
from .. import (
30
30
    errors,
31
31
    urlutils,
32
32
    )
33
 
from bzrlib.transport import decorator
 
33
from . import decorator
34
34
 
35
35
 
36
36
class FakeNFSTransportDecorator(decorator.TransportDecorator):
49
49
        """
50
50
        try:
51
51
            self._decorated.rename(rel_from, rel_to)
52
 
        except (errors.DirectoryNotEmpty, errors.FileExists), e:
 
52
        except (errors.DirectoryNotEmpty, errors.FileExists) as e:
53
53
            # if this is a directory rename, raise
54
54
            # resourcebusy rather than DirectoryNotEmpty
55
55
            stat = self._decorated.stat(rel_to)
66
66
 
67
67
def get_test_permutations():
68
68
    """Return the permutations to be used in testing."""
69
 
    from bzrlib.tests import test_server
 
69
    from breezy.tests import test_server
70
70
    return [(FakeNFSTransportDecorator, test_server.FakeNFSServer),]