/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/tests/test_shelf.py

  • Committer: Jelmer Vernooij
  • Date: 2017-11-12 20:07:32 UTC
  • mto: This revision was merged to the branch mainline in revision 6819.
  • Revision ID: jelmer@jelmer.uk-20171112200732-ehxgen03s9jphe8n
Swap arguments for get_symlink_target and kind/stored_kind.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_shelf.py
249
249
        limbo_name = creator.shelf_transform._limbo_name(s_trans_id)
250
250
        self.assertEqual(link_target, osutils.readlink(limbo_name))
251
251
        ptree = creator.shelf_transform.get_preview_tree()
252
 
        self.assertEqual(link_target, ptree.get_symlink_target('foo-id'))
 
252
        self.assertEqual(link_target, ptree.get_symlink_target(link_name))
253
253
 
254
254
    def test_shelve_symlink_creation(self):
255
255
        self._test_shelve_symlink_creation('foo', 'bar')
283
283
            creator.shelve_change(('modify target', 'foo-id', link_name,
284
284
                                   old_target, new_target))
285
285
        else:
286
 
            creator.shelve_modify_target('foo-id')
 
286
            creator.shelve_modify_target('foo-id', old_target, new_target)
287
287
        creator.transform()
288
288
        self.assertEqual(old_target, osutils.readlink(link_name))
289
289
        s_trans_id = creator.shelf_transform.trans_id_file_id('foo-id')
290
290
        limbo_name = creator.shelf_transform._limbo_name(s_trans_id)
291
291
        self.assertEqual(new_target, osutils.readlink(limbo_name))
292
292
        ptree = creator.shelf_transform.get_preview_tree()
293
 
        self.assertEqual(new_target, ptree.get_symlink_target('foo-id'))
 
293
        self.assertEqual(new_target, ptree.get_symlink_target(link_name))
294
294
 
295
295
    def test_shelve_symlink_target_change(self):
296
296
        self._test_shelve_symlink_target_change('foo', 'bar', 'baz')