/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 breezy/tests/test_remote.py

  • Committer: Jelmer Vernooij
  • Date: 2018-08-08 02:14:32 UTC
  • mfrom: (7063 work)
  • mto: This revision was merged to the branch mainline in revision 7065.
  • Revision ID: jelmer@jelmer.uk-20180808021432-nomib3je4cu2xqkm
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_remote.py
1045
1045
        # XXX: It would be better to call fmt.initialize_on_transport_ex, but
1046
1046
        # it's currently hard to test that without supplying a real remote
1047
1047
        # transport connected to a real server.
1048
 
        result = fmt._initialize_on_transport_ex_rpc(client, 'path',
 
1048
        result = fmt._initialize_on_transport_ex_rpc(client, b'path',
1049
1049
            transport, False, False, False, None, None, None, None, False)
1050
1050
        self.assertFinished(client)
1051
1051
 
1067
1067
        # it's currently hard to test that without supplying a real remote
1068
1068
        # transport connected to a real server.
1069
1069
        err = self.assertRaises(errors.PermissionDenied,
1070
 
            fmt._initialize_on_transport_ex_rpc, client, 'path', transport,
 
1070
            fmt._initialize_on_transport_ex_rpc, client, b'path', transport,
1071
1071
            False, False, False, None, None, None, None, False)
1072
1072
        self.assertEqual('path', err.path)
1073
1073
        self.assertEqual(': extra info', err.extra)
1596
1596
        client = FakeClient(self.get_url())
1597
1597
        branch_network_name = self.get_branch_format().network_name()
1598
1598
        client.add_expected_call(
1599
 
            b'BzrDir.open_branchV3', ('stacked/',),
1600
 
            b'success', ('branch', branch_network_name))
 
1599
            b'BzrDir.open_branchV3', (b'stacked/',),
 
1600
            b'success', (b'branch', branch_network_name))
1601
1601
        client.add_expected_call(
1602
1602
            b'BzrDir.find_repositoryV3', (b'stacked/',),
1603
1603
            b'success', (b'ok', b'', b'yes', b'no', b'yes', network_name))
1994
1994
        client.add_expected_call(
1995
1995
            b'Branch.lock_write', (b'memory:///', b'', b''),
1996
1996
            b'success', (b'ok', b'branch token', b'repo token'))
1997
 
        encoded_dict_value = 'd5:ascii1:a11:unicode \xe2\x8c\x9a3:\xe2\x80\xbde'
 
1997
        encoded_dict_value = b'd5:ascii1:a11:unicode \xe2\x8c\x9a3:\xe2\x80\xbde'
1998
1998
        client.add_expected_call(
1999
1999
            b'Branch.set_config_option_dict', (b'memory:///', b'branch token',
2000
2000
            b'repo token', encoded_dict_value, b'foo', b''),