← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_remote.py

  • Committer: Robert Collins
  • Date: 2010-04-08 04:34:03 UTC
  • mfrom: (5138 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5139.
  • Revision ID: robertc@robertcollins.net-20100408043403-56z0d07vdqrx7f3t
Update bugfix for 528114 to trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_remote.py
418
418
        # Calling _remember_remote_is_before again with a lower value works.
419
419
        client_medium._remember_remote_is_before((1, 5))
420
420
        self.assertTrue(client_medium._is_remote_before((1, 5)))
421
 
        # If you call _remember_remote_is_before with a higher value it logs a
422
 
        # warning, and continues to remember the lower value.
423
 
        self.assertNotContainsRe(self.get_log(), '_remember_remote_is_before')
424
 
        client_medium._remember_remote_is_before((1, 9))
425
 
        self.assertContainsRe(self.get_log(), '_remember_remote_is_before')
426
 
        self.assertTrue(client_medium._is_remote_before((1, 5)))
 
421
        # You cannot call _remember_remote_is_before with a larger value.
 
422
        self.assertRaises(
 
423
            AssertionError, client_medium._remember_remote_is_before, (1, 9))
427
424
 
428
425
 
429
426
class TestBzrDirCloningMetaDir(TestRemote):
531
528
        self.assertIsInstance(bd, RemoteBzrDir)
532
529
        self.assertFinished(client)
533
530
 
534
 
    def test_backwards_compat_hpss_v2(self):
535
 
        client, transport = self.make_fake_client_and_transport()
536
 
        # Monkey-patch fake client to simulate real-world behaviour with v2
537
 
        # server: upon first RPC call detect the protocol version, and because
538
 
        # the version is 2 also do _remember_remote_is_before((1, 6)) before
539
 
        # continuing with the RPC.
540
 
        orig_check_call = client._check_call
541
 
        def check_call(method, args):
542
 
            client._medium._protocol_version = 2
543
 
            client._medium._remember_remote_is_before((1, 6))
544
 
            client._check_call = orig_check_call
545
 
            client._check_call(method, args)
546
 
        client._check_call = check_call
547
 
        client.add_expected_call(
548
 
            'BzrDir.open_2.1', ('quack/',), 'unknown', ('BzrDir.open_2.1',))
549
 
        client.add_expected_call(
550
 
            'BzrDir.open', ('quack/',), 'success', ('yes',))
551
 
        bd = RemoteBzrDir(transport, remote.RemoteBzrDirFormat(),
552
 
            _client=client, _force_probe=True)
553
 
        self.assertIsInstance(bd, RemoteBzrDir)
554
 
        self.assertFinished(client)
555
 
 
556
531
 
557
532
class TestBzrDirOpenBranch(TestRemote):
558
533
 
1248
1223
            len(branch.repository._real_repository._fallback_repositories))
1249
1224
 
1250
1225
    def test_get_stacked_on_real_branch(self):
1251
 
        base_branch = self.make_branch('base')
1252
 
        stacked_branch = self.make_branch('stacked')
 
1226
        base_branch = self.make_branch('base', format='1.6')
 
1227
        stacked_branch = self.make_branch('stacked', format='1.6')
1253
1228
        stacked_branch.set_stacked_on_url('../base')
1254
1229
        reference_format = self.get_repo_format()
1255
1230
        network_name = reference_format.network_name()
1260
1235
            'success', ('branch', branch_network_name))
1261
1236
        client.add_expected_call(
1262
1237
            'BzrDir.find_repositoryV3', ('stacked/',),
1263
 
            'success', ('ok', '', 'yes', 'no', 'yes', network_name))
 
1238
            'success', ('ok', '', 'no', 'no', 'yes', network_name))
1264
1239
        # called twice, once from constructor and then again by us
1265
1240
        client.add_expected_call(
1266
1241
            'Branch.get_stacked_on_url', ('stacked/',),
2216
2191
        """
2217
2192
        # Make a repo with a fallback repo, both using a FakeClient.
2218
2193
        format = remote.response_tuple_to_repo_format(
2219
 
            ('yes', 'no', 'yes', self.get_repo_format().network_name()))
 
2194
            ('yes', 'no', 'yes', 'fake-network-name'))
2220
2195
        repo, client = self.setup_fake_client_and_repository('quack')
2221
2196
        repo._format = format
2222
2197
        fallback_repo, ignored = self.setup_fake_client_and_repository(
2223
2198
            'fallback')
2224
2199
        fallback_repo._client = client
2225
 
        fallback_repo._format = format
2226
2200
        repo.add_fallback_repository(fallback_repo)
2227
2201
        # First the client should ask the primary repo
2228
2202
        client.add_expected_call(