/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/transport/fakenfs.py

  • Committer: Vincent Ladeuil
  • Date: 2009-09-08 16:45:11 UTC
  • mto: (4681.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4682.
  • Revision ID: v.ladeuil+lp@free.fr-20090908164511-5e7eupewxycwaue4
Don't allow remove-tree to succeed with pending merges unless
--force is used.

* bzrlib/tests/blackbox/test_remove_tree.py:
(TestRemoveTree.test_remove_tree_pending_merges,
TestRemoveTree.test_remove_tree_pending_merges_force): Test with
and without --force and pending merges.

* bzrlib/builtins.py:
(cmd_remove_tree.run): Check pending merges too.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/fakenfs.py
28
28
    errors,
29
29
    urlutils,
30
30
    )
31
 
from bzrlib.transport import decorator
32
 
 
33
 
 
34
 
class FakeNFSTransportDecorator(decorator.TransportDecorator):
 
31
from bzrlib.transport.decorator import TransportDecorator, DecoratorServer
 
32
 
 
33
 
 
34
class FakeNFSTransportDecorator(TransportDecorator):
35
35
    """A transport that behaves like NFS, for testing"""
36
36
 
37
37
    @classmethod
62
62
        return self._decorated.delete(relpath)
63
63
 
64
64
 
 
65
class FakeNFSServer(DecoratorServer):
 
66
    """Server for the FakeNFSTransportDecorator for testing with."""
 
67
 
 
68
    def get_decorator_class(self):
 
69
        return FakeNFSTransportDecorator
 
70
 
 
71
 
65
72
def get_test_permutations():
66
73
    """Return the permutations to be used in testing."""
67
 
    from bzrlib.tests import test_server
68
 
    return [(FakeNFSTransportDecorator, test_server.FakeNFSServer),]
 
74
    return [(FakeNFSTransportDecorator, FakeNFSServer),
 
75
            ]