← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_smart.py

resolve conflicts against trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_smart.py
99
99
        # the default or a parameterized class, but rather use the
100
100
        # TestCaseWithTransport infrastructure to set up a smart server and
101
101
        # transport.
102
 
        self.transport_server = self.make_transport_server
 
102
        self.overrideAttr(self, "transport_server", self.make_transport_server)
103
103
 
104
104
    def make_transport_server(self):
105
105
        return test_server.SmartTCPServer_for_testing('-' + self.id())
932
932
        # its repository.
933
933
        self.make_tree_with_two_commits()
934
934
        rev_id_utf8 = u'\xc8'.encode('utf-8')
935
 
        self.tree.branch.set_revision_history([])
 
935
        self.tree.branch.set_last_revision_info(0, 'null:')
936
936
        self.assertEqual(
937
937
            (0, 'null:'), self.tree.branch.last_revision_info())
938
938
        # We can update the branch to a revision that is present in the