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

  • Committer: Vincent Ladeuil
  • Date: 2010-01-25 15:55:48 UTC
  • mto: (4985.1.4 add-attr-cleanup)
  • mto: This revision was merged to the branch mainline in revision 4988.
  • Revision ID: v.ladeuil+lp@free.fr-20100125155548-0l352pujvt5bzl5e
Deploy addAttrCleanup on the whole test suite.

Several use case worth mentioning:

- setting a module or any other object attribute is the majority
by far. In some cases the setting itself is deferred but most of
the time we want to set at the same time we add the cleanup.

- there multiple occurrences of protecting hooks or ui factory
which are now useless (the test framework takes care of that now),

- there was some lambda uses that can now be avoided.

That first cleanup already simplifies things a lot.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_transform.py
735
735
                                         ' versioned, but has versioned'
736
736
                                         ' children.  Versioned directory.')
737
737
        self.assertEqual(conflicts_s[6], 'Conflict moving oz/emeraldcity into'
738
 
                                         ' oz/emeraldcity. Cancelled move.')
 
738
                                         ' oz/emeraldcity.  Cancelled move.')
739
739
 
740
740
    def prepare_wrong_parent_kind(self):
741
741
        tt, root = self.get_transform()
2371
2371
    def test_ignore_pb(self):
2372
2372
        # pb could be supported, but TT.iter_changes doesn't support it.
2373
2373
        revision_tree, preview_tree = self.get_tree_and_preview_tree()
2374
 
        preview_tree.iter_changes(revision_tree)
 
2374
        preview_tree.iter_changes(revision_tree, pb=progress.DummyProgress())
2375
2375
 
2376
2376
    def test_kind(self):
2377
2377
        revision_tree = self.create_tree()
2779
2779
        file_trans_id = preview.trans_id_file_id('file-id')
2780
2780
        preview.delete_contents(file_trans_id)
2781
2781
        preview.create_file('a\nb\n', file_trans_id)
 
2782
        pb = progress.DummyProgress()
2782
2783
        preview_tree = preview.get_preview_tree()
2783
 
        merger = Merger.from_revision_ids(None, preview_tree,
 
2784
        merger = Merger.from_revision_ids(pb, preview_tree,
2784
2785
                                          child_tree.branch.last_revision(),
2785
2786
                                          other_branch=child_tree.branch,
2786
2787
                                          tree_branch=work_tree.branch)
2798
2799
        tt.new_file('name', tt.root, 'content', 'file-id')
2799
2800
        tree2 = self.make_branch_and_tree('tree2')
2800
2801
        tree2.set_root_id('TREE_ROOT')
 
2802
        pb = progress.DummyProgress()
2801
2803
        merger = Merger.from_uncommitted(tree2, tt.get_preview_tree(),
2802
 
                                         None, tree.basis_tree())
 
2804
                                         pb, tree.basis_tree())
2803
2805
        merger.merge_type = Merge3Merger
2804
2806
        merger.do_merge()
2805
2807
 
2815
2817
        tt.create_file('baz', trans_id)
2816
2818
        tree2 = tree.bzrdir.sprout('tree2').open_workingtree()
2817
2819
        self.build_tree_contents([('tree2/foo', 'qux')])
2818
 
        pb = None
 
2820
        pb = progress.DummyProgress()
2819
2821
        merger = Merger.from_uncommitted(tree2, tt.get_preview_tree(),
2820
2822
                                         pb, tree.basis_tree())
2821
2823
        merger.merge_type = Merge3Merger