/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_commit.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_commit.py
646
646
        timestamp_1ms = round(timestamp, 3)
647
647
        self.assertEqual(timestamp_1ms, timestamp)
648
648
 
649
 
    def assertBasisTreeKind(self, kind, tree, file_id):
 
649
    def assertBasisTreeKind(self, kind, tree, path):
650
650
        basis = tree.basis_tree()
651
651
        basis.lock_read()
652
652
        try:
653
 
            self.assertEqual(kind, basis.kind(file_id))
 
653
            self.assertEqual(kind, basis.kind(path))
654
654
        finally:
655
655
            basis.unlock()
656
656
 
660
660
        os.symlink('target', 'name')
661
661
        tree.add('name', 'a-file-id')
662
662
        tree.commit('Added a symlink')
663
 
        self.assertBasisTreeKind('symlink', tree, 'a-file-id')
 
663
        self.assertBasisTreeKind('symlink', tree, 'name')
664
664
 
665
665
        os.unlink('name')
666
666
        self.build_tree(['name'])
667
667
        tree.commit('Changed symlink to file')
668
 
        self.assertBasisTreeKind('file', tree, 'a-file-id')
 
668
        self.assertBasisTreeKind('file', tree, 'name')
669
669
 
670
670
        os.unlink('name')
671
671
        os.symlink('target', 'name')
672
672
        tree.commit('file to symlink')
673
 
        self.assertBasisTreeKind('symlink', tree, 'a-file-id')
 
673
        self.assertBasisTreeKind('symlink', tree, 'name')
674
674
 
675
675
        os.unlink('name')
676
676
        os.mkdir('name')
677
677
        tree.commit('symlink to directory')
678
 
        self.assertBasisTreeKind('directory', tree, 'a-file-id')
 
678
        self.assertBasisTreeKind('directory', tree, 'name')
679
679
 
680
680
        os.rmdir('name')
681
681
        os.symlink('target', 'name')
682
682
        tree.commit('directory to symlink')
683
 
        self.assertBasisTreeKind('symlink', tree, 'a-file-id')
 
683
        self.assertBasisTreeKind('symlink', tree, 'name')
684
684
 
685
685
        # prepare for directory <-> file tests
686
686
        os.unlink('name')
687
687
        os.mkdir('name')
688
688
        tree.commit('symlink to directory')
689
 
        self.assertBasisTreeKind('directory', tree, 'a-file-id')
 
689
        self.assertBasisTreeKind('directory', tree, 'name')
690
690
 
691
691
        os.rmdir('name')
692
692
        self.build_tree(['name'])
693
693
        tree.commit('Changed directory to file')
694
 
        self.assertBasisTreeKind('file', tree, 'a-file-id')
 
694
        self.assertBasisTreeKind('file', tree, 'name')
695
695
 
696
696
        os.unlink('name')
697
697
        os.mkdir('name')
698
698
        tree.commit('file to directory')
699
 
        self.assertBasisTreeKind('directory', tree, 'a-file-id')
 
699
        self.assertBasisTreeKind('directory', tree, 'name')
700
700
 
701
701
    def test_commit_unversioned_specified(self):
702
702
        """Commit should raise if specified files isn't in basis or worktree"""