← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_remote.py

https://launchpad.net/bugs/819604
Merge the fix for bug #819604 into trunk, resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_remote.py
64
64
    SmartServerRepositoryGetParentMap,
65
65
    SmartServerRepositoryGetStream_1_19,
66
66
    )
67
 
from bzrlib.symbol_versioning import deprecated_in
68
67
from bzrlib.tests import (
69
68
    test_server,
70
69
    )
116
115
 
117
116
    def test_remote_branch_revision_history(self):
118
117
        b = BzrDir.open_from_transport(self.transport).open_branch()
119
 
        self.assertEqual([],
120
 
            self.applyDeprecated(deprecated_in((2, 5, 0)), b.revision_history))
 
118
        self.assertEqual([], b.revision_history())
121
119
        r1 = self.local_wt.commit('1st commit')
122
120
        r2 = self.local_wt.commit('1st commit', rev_id=u'\xc8'.encode('utf8'))
123
 
        self.assertEqual([r1, r2],
124
 
            self.applyDeprecated(deprecated_in((2, 5, 0)), b.revision_history))
 
121
        self.assertEqual([r1, r2], b.revision_history())
125
122
 
126
123
    def test_find_correct_format(self):
127
124
        """Should open a RemoteBzrDir over a RemoteTransport"""