← 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: Jelmer Vernooij
  • Date: 2011-12-11 13:30:10 UTC
  • mto: This revision was merged to the branch mainline in revision 6354.
  • Revision ID: jelmer@samba.org-20111211133010-p8ox9ybu2knzm7h4
Fix test.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_remote.py
2380
2380
        repo, client = self.setup_fake_client_and_repository(transport_path)
2381
2381
        body = ("garbage_inventories: 2\n"
2382
2382
                "inconsistent_parents: 3\n")
 
2383
        client.add_expected_call(
 
2384
            'Repository.lock_write', ('hill/', ''),
 
2385
            'success', ('ok', 'a token'))
2383
2386
        client.add_success_response_with_body(body, 'ok')
2384
2387
        reconciler = repo.reconcile()
2385
2388
        self.assertEqual(
2386
 
            [('call_expecting_body', 'Repository.reconcile',
2387
 
                ('hill/', ))],
 
2389
            [('call', 'Repository.lock_write', ('hill/', '')),
 
2390
             ('call_expecting_body', 'Repository.reconcile',
 
2391
                ('hill/', 'a token'))],
2388
2392
            client._calls)
2389
2393
        self.assertEquals(2, reconciler.garbage_inventories)
2390
2394
        self.assertEquals(3, reconciler.inconsistent_parents)