← 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-04 22:23:20 UTC
  • mfrom: (5825 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5830.
  • Revision ID: jelmer@samba.org-20110504222320-bczsppms2wadcrb4
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_workingtree/test_smart_add.py
252
252
        self.addCleanup(wt.unlock)
253
253
        self.assertEqual([('', wt.path2id('')),
254
254
                          ('dir1', 'directory-dir1'),
 
255
                          ('file1', 'file-file1'),
255
256
                          ('dir1/file2', 'file-dir1%file2'),
256
 
                          ('file1', 'file-file1'),
257
257
                         ], [(path, ie.file_id) for path, ie
258
 
                                in wt.inventory.iter_entries()])
 
258
                                in wt.iter_entries_by_dir()])
259
259
 
260
260
 
261
261
class TestSmartAddConflictRelatedFiles(per_workingtree.TestCaseWithWorkingTree):
311
311
        self.addCleanup(self.wt.unlock)
312
312
        self.assertEqual([('', 'directory'), (u'\xe5', 'file')],
313
313
                         [(path, ie.kind) for path,ie in
314
 
                          self.wt.inventory.iter_entries()])
 
314
                          self.wt.iter_entries_by_dir()])
315
315
 
316
316
    def test_accessible_implicit(self):
317
317
        osutils.normalized_filename = osutils._accessible_normalized_filename
326
326
        self.addCleanup(self.wt.unlock)
327
327
        self.assertEqual([('', 'directory'), (u'\xe5', 'file')],
328
328
                         [(path, ie.kind) for path,ie
329
 
                          in self.wt.inventory.iter_entries()])
 
329
                          in self.wt.iter_entries_by_dir()])
330
330
 
331
331
    def test_inaccessible_explicit(self):
332
332
        osutils.normalized_filename = osutils._inaccessible_normalized_filename