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

  • Committer: Robert Collins
  • Date: 2010-05-11 08:44:59 UTC
  • mfrom: (5221 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5223.
  • Revision ID: robertc@robertcollins.net-20100511084459-pb0uinna9zs3wu59
Merge trunk - resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_remote.py
609
609
        # _get_tree_branch is a form of open_branch, but it should only ask for
610
610
        # branch opening, not any other network requests.
611
611
        calls = []
612
 
        def open_branch():
 
612
        def open_branch(name=None):
613
613
            calls.append("Called")
614
614
            return "a-branch"
615
615
        transport = MemoryTransport()
2301
2301
        transport_path = 'quack'
2302
2302
        repo, client = self.setup_fake_client_and_repository(transport_path)
2303
2303
        client.add_success_response('ok', 'a token')
2304
 
        result = repo.lock_write()
 
2304
        token = repo.lock_write().repository_token
2305
2305
        self.assertEqual(
2306
2306
            [('call', 'Repository.lock_write', ('quack/', ''))],
2307
2307
            client._calls)
2308
 
        self.assertEqual('a token', result)
 
2308
        self.assertEqual('a token', token)
2309
2309
 
2310
2310
    def test_lock_write_already_locked(self):
2311
2311
        transport_path = 'quack'