/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/nosmart.py

  • Committer: Vincent Ladeuil
  • Date: 2009-06-30 15:54:23 UTC
  • mto: (4496.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4497.
  • Revision ID: v.ladeuil+lp@free.fr-20090630155423-afousrl3zrdx0he2
Fixed as per jam's review.

* tests/blackbox/test_push.py:
(load_tests): One more changes type.
(TestPushStrictMixin): Switch to using mixin, it's clearer.
Define some default values as attributes so that they can be
changed more easily.
(TestPushStrictMixin.assertPushFails,
TestPushStrictMixin.assertPushSucceeds): Use default values from
attributes.
(TestPushStrictWithChanges._out_of_sync_trees): Setup a new
context and change the default values.

* errors.py:
(OutOfDateTree, UncommittedChanges): Add a more parameter so more
details can be given.

* builtins.py:
(cmd_push.run): Add an additional check that the tree is still in
sync with its branch before pushing.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/nosmart.py
22
22
"""
23
23
 
24
24
from bzrlib import errors
25
 
from bzrlib.transport import decorator
26
 
 
27
 
 
28
 
class NoSmartTransportDecorator(decorator.TransportDecorator):
 
25
from bzrlib.transport.decorator import TransportDecorator, DecoratorServer
 
26
 
 
27
 
 
28
class NoSmartTransportDecorator(TransportDecorator):
29
29
    """A decorator for transports that disables get_smart_medium."""
30
30
 
31
31
    @classmethod
36
36
        raise errors.NoSmartMedium(self)
37
37
 
38
38
 
 
39
class NoSmartTransportServer(DecoratorServer):
 
40
    """Server for the NoSmartTransportDecorator for testing with."""
 
41
 
 
42
    def get_decorator_class(self):
 
43
        return NoSmartTransportDecorator
 
44
 
 
45
 
39
46
def get_test_permutations():
40
47
    """Return the permutations to be used in testing."""
41
 
    from bzrlib.tests import test_server
42
 
    return [(NoSmartTransportDecorator, test_server.NoSmartTransportServer)]
 
48
    return [(NoSmartTransportDecorator, NoSmartTransportServer)]
43
49