← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Martin Packman
  • Date: 2012-01-05 09:50:04 UTC
  • mfrom: (6424 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6426.
  • Revision ID: martin.packman@canonical.com-20120105095004-mia9xb7y0efmto0v
Merge bzr.dev to resolve conflicts in bzrlib.builtins

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_workingtree/test_add.py
101
101
        tree.add(['dir/subdir/foo'], ['foo-id'])
102
102
        root_id = tree.get_root_id()
103
103
 
104
 
        self.assertTreeLayout([('', root_id), ('dir', 'dir-id'),
105
 
                               ('dir/subdir', 'subdir-id'),
 
104
        self.assertTreeLayout([('', root_id), ('dir/', 'dir-id'),
 
105
                               ('dir/subdir/', 'subdir-id'),
106
106
                               ('dir/subdir/foo', 'foo-id')], tree)
107
107
 
108
108
    def test_add_multiple(self):
113
113
        root_id = tree.get_root_id()
114
114
 
115
115
        self.assertTreeLayout([('', root_id), ('a', 'a-id'), ('b', 'b-id'),
116
 
                               ('dir', 'dir-id'), ('dir/subdir', 'subdir-id'),
 
116
                               ('dir/', 'dir-id'), ('dir/subdir/', 'subdir-id'),
117
117
                               ('dir/subdir/foo', 'foo-id')], tree)
118
118
 
119
119
    def test_add_invalid(self):