← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_transform.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-09-23 09:00:18 UTC
  • mfrom: (5439.1.1 merge-2.2-into-devel)
  • Revision ID: pqm@pqm.ubuntu.com-20100923090018-01aj4ifyzaps50bo
(spiv) Merge lp:bzr/2.2. (Andrew Bennetts)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_transform.py
123
123
        imaginary_id = transform.trans_id_tree_path('imaginary')
124
124
        imaginary_id2 = transform.trans_id_tree_path('imaginary/')
125
125
        self.assertEqual(imaginary_id, imaginary_id2)
126
 
        self.assertEqual(transform.get_tree_parent(imaginary_id), root)
127
 
        self.assertEqual(transform.final_kind(root), 'directory')
128
 
        self.assertEqual(transform.final_file_id(root), self.wt.get_root_id())
 
126
        self.assertEqual(root, transform.get_tree_parent(imaginary_id))
 
127
        self.assertEqual('directory', transform.final_kind(root))
 
128
        self.assertEqual(self.wt.get_root_id(), transform.final_file_id(root))
129
129
        trans_id = transform.create_path('name', root)
130
130
        self.assertIs(transform.final_file_id(trans_id), None)
131
 
        self.assertRaises(NoSuchFile, transform.final_kind, trans_id)
 
131
        self.assertIs(None, transform.final_kind(trans_id))
132
132
        transform.create_file('contents', trans_id)
133
133
        transform.set_executability(True, trans_id)
134
134
        transform.version_file('my_pretties', trans_id)