/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_diff.py

  • Committer: Jelmer Vernooij
  • Date: 2017-10-27 09:03:47 UTC
  • mfrom: (6798.1.1 escaping)
  • Revision ID: jelmer@jelmer.uk-20171027090347-yxa0xg7rwftar05a
Merge lp:~jelmer/brz/escaping.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_diff.py
585
585
        d = get_diff_as_string(tree.basis_tree(), tree)
586
586
 
587
587
        self.assertContainsRe(d, r"file 'a'.*\(properties changed:"
588
 
                                  ".*\+x to -x.*\)")
 
588
                                 r".*\+x to -x.*\)")
589
589
        self.assertContainsRe(d, r"file 'b'.*\(properties changed:"
590
 
                                  ".*-x to \+x.*\)")
 
590
                                 r".*-x to \+x.*\)")
591
591
        self.assertContainsRe(d, r"file 'c'.*\(properties changed:"
592
 
                                  ".*\+x to -x.*\)")
 
592
                                 r".*\+x to -x.*\)")
593
593
        self.assertContainsRe(d, r"file 'd'.*\(properties changed:"
594
 
                                  ".*-x to \+x.*\)")
 
594
                                 r".*-x to \+x.*\)")
595
595
        self.assertNotContainsRe(d, r"file 'e'")
596
596
        self.assertNotContainsRe(d, r"file 'f'")
597
597
 
759
759
        self.new_tree.add('file', 'file-id')
760
760
        os.unlink('old-tree/file')
761
761
        self.differ.show_diff(None)
762
 
        self.assertContainsRe(self.differ.to_file.getvalue(), '\+contents')
 
762
        self.assertContainsRe(self.differ.to_file.getvalue(), r'\+contents')
763
763
 
764
764
    def test_diff_symlink(self):
765
765
        differ = diff.DiffSymlink(self.old_tree, self.new_tree, BytesIO())
790
790
        self.assertContainsRe(
791
791
            self.differ.to_file.getvalue(),
792
792
            r'--- olddir/oldfile.*\n\+\+\+ newdir/newfile.*\n\@\@ -1,1 \+1,1'
793
 
             ' \@\@\n-old\n\+new\n\n')
 
793
            r' \@\@\n-old\n\+new\n\n')
794
794
 
795
795
    def test_diff_kind_change(self):
796
796
        self.requireFeature(features.SymlinkFeature)
806
806
        self.assertContainsRe(
807
807
            self.differ.to_file.getvalue(),
808
808
            r'--- olddir/oldfile.*\n\+\+\+ newdir/newfile.*\n\@\@ -1,1 \+0,0'
809
 
             ' \@\@\n-old\n\n')
 
809
            r' \@\@\n-old\n\n')
810
810
        self.assertContainsRe(self.differ.to_file.getvalue(),
811
811
                              "=== target is u'new'\n")
812
812
 
839
839
        self.assertNotContainsRe(
840
840
            differ.to_file.getvalue(),
841
841
            r'--- olddir/oldfile.*\n\+\+\+ newdir/newfile.*\n\@\@ -1,1 \+1,1'
842
 
             ' \@\@\n-old\n\+new\n\n')
 
842
            r' \@\@\n-old\n\+new\n\n')
843
843
        self.assertContainsRe(differ.to_file.getvalue(),
844
844
                              'was: old\nis: new\n')
845
845
 
851
851
        self.assertNotContainsRe(
852
852
            differ.to_file.getvalue(),
853
853
            r'--- olddir/oldfile.*\n\+\+\+ newdir/newfile.*\n\@\@ -1,1 \+1,1'
854
 
             ' \@\@\n-old\n\+new\n\n')
 
854
            r' \@\@\n-old\n\+new\n\n')
855
855
        self.assertContainsRe(differ.to_file.getvalue(),
856
856
                              'was: old\nis: new\n')
857
857