← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_add.py

Merge bzr.dev 4187, and revert the change to fix refcycle issues.

I apparently didn't run the smart fetch tests. Which show that we access inv+chk pages
as a fulltext, and then insert the stream, which expects to get the block as a compressed
block. :(.
Need to rethink how to do it, possibly with weakrefs.


This also brings in CommitBuilder.record_iter_changes() and the updates to btree_index
and backing indices.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_add.py
19
19
 
20
20
import os
21
21
 
 
22
from bzrlib.tests import (
 
23
    condition_isinstance,
 
24
    split_suite_by_condition,
 
25
    multiply_tests,
 
26
    )
22
27
from bzrlib.tests.blackbox import ExternalBase
23
28
from bzrlib.tests.test_win32utils import NeedsGlobExpansionFeature
24
29
 
25
30
 
 
31
def load_tests(standard_tests, module, loader):
 
32
    """Parameterize tests for view-aware vs not."""
 
33
    to_adapt, result = split_suite_by_condition(
 
34
        standard_tests, condition_isinstance(TestAdd))
 
35
    scenarios = [
 
36
        ('pre-views', {'branch_tree_format': 'pack-0.92'}),
 
37
        ('view-aware', {'branch_tree_format': 'development-wt5'}),
 
38
        ]
 
39
    return multiply_tests(to_adapt, scenarios, result)
 
40
 
 
41
 
26
42
class TestAdd(ExternalBase):
27
43
 
 
44
    def make_branch_and_tree(self, dir):
 
45
        return ExternalBase.make_branch_and_tree(self, dir,
 
46
            format=self.branch_tree_format)
 
47
 
28
48
    def test_add_reports(self):
29
49
        """add command prints the names of added files."""
30
50
        tree = self.make_branch_and_tree('.')