← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_smart_add.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-03-07 10:45:44 UTC
  • mfrom: (2321.1.2 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20070307104544-59e3e6358e4bdb29
(robertc) Merge dirstate and subtrees. (Robert Collins, Martin Pool, Aaaron Bentley, John A Meinel, James Westby)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_smart_add.py
35
35
 
36
36
    def test_add_dot_from_root(self):
37
37
        """Test adding . from the root of the tree.""" 
38
 
        from bzrlib.add import smart_add
39
38
        paths = ("original/", "original/file1", "original/file2")
40
39
        self.build_tree(paths)
41
40
        wt = self.make_branch_and_tree('.')
109
108
        for path in expected_paths:
110
109
            self.assertNotEqual(wt.path2id(path), None, "No id added for %s" % path)
111
110
 
112
 
    def test_save_false(self):
113
 
        """Test smart-adding a path with save set to false."""
114
 
        wt = self.make_branch_and_tree('.')
115
 
        self.build_tree(['file'])
116
 
        smart_add_tree(wt, ['file'], save=False)
117
 
        self.assertNotEqual(wt.path2id('file'), None, "No id added for 'file'")
118
 
        wt.read_working_inventory()
119
 
        self.assertEqual(wt.path2id('file'), None)
120
 
 
121
111
    def test_add_dry_run(self):
122
112
        """Test a dry run add, make sure nothing is added."""
123
113
        from bzrlib.commands import run_bzr
260
250
                              'added dir1/file2 with id file-dir1%file2\n',
261
251
                              'added file1 with id file-file1\n',
262
252
                             ], lines)
263
 
        self.assertEqual([('', wt.inventory.root.file_id),
 
253
        wt.lock_read()
 
254
        self.addCleanup(wt.unlock)
 
255
        self.assertEqual([('', wt.path2id('')),
264
256
                          ('dir1', 'directory-dir1'),
265
257
                          ('dir1/file2', 'file-dir1%file2'),
266
258
                          ('file1', 'file-file1'),
343
335
        # These should get newly generated ids
344
336
        c_id = new_tree.path2id('c')
345
337
        self.assertNotEqual(None, c_id)
 
338
        self.base_tree.lock_read()
 
339
        self.addCleanup(self.base_tree.unlock)
346
340
        self.failIf(c_id in self.base_tree)
347
341
 
348
342
        d_id = new_tree.path2id('subdir/d')
366
360
        # matching path or child of 'subby'.
367
361
        a_id = new_tree.path2id('subby/a')
368
362
        self.assertNotEqual(None, a_id)
 
363
        self.base_tree.lock_read()
 
364
        self.addCleanup(self.base_tree.unlock)
369
365
        self.failIf(a_id in self.base_tree)
370
366
 
371
367
 
385
381
        osutils.normalized_filename = osutils._accessible_normalized_filename
386
382
        try:
387
383
            smart_add_tree(self.wt, [u'a\u030a'])
 
384
            self.wt.lock_read()
 
385
            self.addCleanup(self.wt.unlock)
388
386
            self.assertEqual([('', 'directory'), (u'\xe5', 'file')],
389
387
                    [(path, ie.kind) for path,ie in 
390
388
                        self.wt.inventory.iter_entries()])
397
395
        osutils.normalized_filename = osutils._accessible_normalized_filename
398
396
        try:
399
397
            smart_add_tree(self.wt, [])
 
398
            self.wt.lock_read()
 
399
            self.addCleanup(self.wt.unlock)
400
400
            self.assertEqual([('', 'directory'), (u'\xe5', 'file')],
401
401
                    [(path, ie.kind) for path,ie in 
402
402
                        self.wt.inventory.iter_entries()])