/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__chk_map.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) 2009, 2010 Canonical Ltd
 
1
# Copyright (C) 2009, 2010, 2011 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
236
236
        self.assertEqual(("sha1:1234",), node.key())
237
237
        self.assertEqual('pref\x00fo', node._search_prefix)
238
238
        self.assertEqual({'pref\x00fo\x00': ('sha1:abcd',)}, node._items)
 
239
 
 
240
 
 
241
class Test_BytesToTextKey(tests.TestCase):
 
242
 
 
243
    def assertBytesToTextKey(self, key, bytes):
 
244
        self.assertEqual(key,
 
245
                         self.module._bytes_to_text_key(bytes))
 
246
 
 
247
    def assertBytesToTextKeyRaises(self, bytes):
 
248
        # These are invalid bytes, and we want to make sure the code under test
 
249
        # raises an exception rather than segfaults, etc. We don't particularly
 
250
        # care what exception.
 
251
        self.assertRaises(Exception, self.module._bytes_to_text_key, bytes)
 
252
 
 
253
    def test_file(self):
 
254
        self.assertBytesToTextKey(('file-id', 'revision-id'),
 
255
                 'file: file-id\nparent-id\nname\nrevision-id\n'
 
256
                 'da39a3ee5e6b4b0d3255bfef95601890afd80709\n100\nN')
 
257
 
 
258
    def test_invalid_no_kind(self):
 
259
        self.assertBytesToTextKeyRaises(
 
260
                 'file  file-id\nparent-id\nname\nrevision-id\n'
 
261
                 'da39a3ee5e6b4b0d3255bfef95601890afd80709\n100\nN')
 
262
 
 
263
    def test_invalid_no_space(self):
 
264
        self.assertBytesToTextKeyRaises(
 
265
                 'file:file-id\nparent-id\nname\nrevision-id\n'
 
266
                 'da39a3ee5e6b4b0d3255bfef95601890afd80709\n100\nN')
 
267
 
 
268
    def test_invalid_too_short_file_id(self):
 
269
        self.assertBytesToTextKeyRaises('file:file-id')
 
270
 
 
271
    def test_invalid_too_short_parent_id(self):
 
272
        self.assertBytesToTextKeyRaises('file:file-id\nparent-id')
 
273
 
 
274
    def test_invalid_too_short_name(self):
 
275
        self.assertBytesToTextKeyRaises('file:file-id\nparent-id\nname')
 
276
 
 
277
    def test_dir(self):
 
278
        self.assertBytesToTextKey(('dir-id', 'revision-id'),
 
279
                 'dir: dir-id\nparent-id\nname\nrevision-id')