← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Jelmer Vernooij
  • Date: 2011-05-10 07:46:15 UTC
  • mfrom: (5844 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5845.
  • Revision ID: jelmer@samba.org-20110510074615-eptod049ndjxc4i7
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_workingtree/test_smart_add.py
21
21
import sys
22
22
 
23
23
from bzrlib import (
24
 
    add,
25
24
    errors,
26
25
    ignores,
27
26
    osutils,
28
27
    tests,
29
 
    workingtree,
30
28
    )
31
29
from bzrlib.tests import (
32
30
    test_smart_add,
252
250
        self.addCleanup(wt.unlock)
253
251
        self.assertEqual([('', wt.path2id('')),
254
252
                          ('dir1', 'directory-dir1'),
 
253
                          ('file1', 'file-file1'),
255
254
                          ('dir1/file2', 'file-dir1%file2'),
256
 
                          ('file1', 'file-file1'),
257
255
                         ], [(path, ie.file_id) for path, ie
258
 
                                in wt.inventory.iter_entries()])
 
256
                                in wt.iter_entries_by_dir()])
259
257
 
260
258
 
261
259
class TestSmartAddConflictRelatedFiles(per_workingtree.TestCaseWithWorkingTree):
311
309
        self.addCleanup(self.wt.unlock)
312
310
        self.assertEqual([('', 'directory'), (u'\xe5', 'file')],
313
311
                         [(path, ie.kind) for path,ie in
314
 
                          self.wt.inventory.iter_entries()])
 
312
                          self.wt.iter_entries_by_dir()])
315
313
 
316
314
    def test_accessible_implicit(self):
317
315
        osutils.normalized_filename = osutils._accessible_normalized_filename
326
324
        self.addCleanup(self.wt.unlock)
327
325
        self.assertEqual([('', 'directory'), (u'\xe5', 'file')],
328
326
                         [(path, ie.kind) for path,ie
329
 
                          in self.wt.inventory.iter_entries()])
 
327
                          in self.wt.iter_entries_by_dir()])
330
328
 
331
329
    def test_inaccessible_explicit(self):
332
330
        osutils.normalized_filename = osutils._inaccessible_normalized_filename