~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_smart.py

  • Committer: Vincent Ladeuil
  • Date: 2012-01-05 14:26:58 UTC
  • mto: This revision was merged to the branch mainline in revision 6468.
  • Revision ID: v.ladeuil+lp@free.fr-20120105142658-vek3v6pzlxb751s2
Tests passing for a first rough version of a cached branch config store. The changes here are too invasive and several parallel proposals have been made. 

@only_raises is evil and gave a hard time since any exception during
save_changes() was swallowed.

Possible improvements: 

- add some needs_write_lock decorators to crucial
  methods (_set_config_location ?) but keep locking the branch at higher levels

- decorate branch.unlock to call stack.save if last_lock() it True
  outside of @only_raises scope (evil decorator)

- add @needs_write_lock to stack.set and stack.remove (will probably get
  rid of most testing issues) we probably need a specialized decorator
  that can relay to the store and from there to the branch or whatever is
  needed. This will also helps bzr config to get it right. The
  get_mutable_section trick should not be needed anymore either.

- decorate branch.unlock to call stack.save if last_lock() it True outside
  of @only_raises scope (evil decorator)

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Copyright (C) 2006-2011 Canonical Ltd
 
1
# Copyright (C) 2006-2012 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
1296
1296
        finally:
1297
1297
            branch.unlock()
1298
1298
        self.assertEqual(smart_req.SuccessfulSmartServerResponse(()), response)
1299
 
        self.assertEqual(None, branch.get_parent())
 
1299
        refreshed = _mod_branch.Branch.open(branch.base)
 
1300
        self.assertEqual(None, refreshed.get_parent())
1300
1301
 
1301
1302
    def test_set_parent_something(self):
1302
1303
        branch = self.make_branch('base', format="1.9")
1305
1306
        branch_token, repo_token = self.get_lock_tokens(branch)
1306
1307
        try:
1307
1308
            response = request.execute('base', branch_token, repo_token,
1308
 
            'http://bar/')
 
1309
                                       'http://bar/')
1309
1310
        finally:
1310
1311
            branch.unlock()
1311
1312
        self.assertEqual(smart_req.SuccessfulSmartServerResponse(()), response)
1312
 
        self.assertEqual('http://bar/', branch.get_parent())
 
1313
        refreshed = _mod_branch.Branch.open(branch.base)
 
1314
        self.assertEqual('http://bar/', refreshed.get_parent())
1313
1315
 
1314
1316
 
1315
1317
class TestSmartServerBranchRequestGetTagsBytes(