/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_repository.py

Merge cleanup into shell-like-tests

Show diffs side-by-side

added added

removed removed

Lines of Context:
24
24
 
25
25
from stat import S_ISDIR
26
26
from StringIO import StringIO
 
27
import sys
27
28
 
28
29
import bzrlib
29
30
from bzrlib.errors import (NotBranchError,
252
253
        tree = control.create_workingtree()
253
254
        tree.add(['foo'], ['Foo:Bar'], ['file'])
254
255
        tree.put_file_bytes_non_atomic('Foo:Bar', 'content\n')
255
 
        tree.commit('first post', rev_id='first')
 
256
        try:
 
257
            tree.commit('first post', rev_id='first')
 
258
        except errors.IllegalPath:
 
259
            if sys.platform != 'win32':
 
260
                raise
 
261
            self.knownFailure('Foo:Bar cannot be used as a file-id on windows'
 
262
                              ' in repo format 7')
 
263
            return
256
264
        self.assertEqualDiff(
257
265
            '# bzr weave file v5\n'
258
266
            'i\n'
1419
1427
            index_class=BTreeGraphIndex,
1420
1428
            use_chk_index=False)
1421
1429
        pack = pack_repo.NewPack(collection)
 
1430
        self.addCleanup(pack.abort) # Make sure the write stream gets closed
1422
1431
        self.assertIsInstance(pack.revision_index, BTreeBuilder)
1423
1432
        self.assertIsInstance(pack.inventory_index, BTreeBuilder)
1424
1433
        self.assertIsInstance(pack._hash, type(osutils.md5()))
1477
1486
        packer = pack_repo.OptimisingPacker(self.get_pack_collection(),
1478
1487
                                            [], '.test')
1479
1488
        new_pack = packer.open_pack()
 
1489
        self.addCleanup(new_pack.abort) # ensure cleanup
1480
1490
        self.assertIsInstance(new_pack, pack_repo.NewPack)
1481
1491
        self.assertTrue(new_pack.revision_index._optimize_for_size)
1482
1492
        self.assertTrue(new_pack.inventory_index._optimize_for_size)