/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/blackbox/test_shelve.py

  • Committer: Jelmer Vernooij
  • Date: 2019-05-29 03:22:34 UTC
  • mfrom: (7303 work)
  • mto: This revision was merged to the branch mainline in revision 7306.
  • Revision ID: jelmer@jelmer.uk-20190529032234-mt3fuws8gq03tapi
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_shelve.py
109
109
    def test_non_ascii(self):
110
110
        """Test that we can show a non-ascii diff that would result from unshelving"""
111
111
 
112
 
        init_content = u'Initial: \u0418\u0437\u043d\u0430\u0447\n'.encode('utf-8')
 
112
        init_content = u'Initial: \u0418\u0437\u043d\u0430\u0447\n'.encode(
 
113
            'utf-8')
113
114
        more_content = u'More: \u0415\u0449\u0451\n'.encode('utf-8')
114
115
        next_content = init_content + more_content
115
116
        diff_part = b'@@ -1,1 +1,2 @@\n %s+%s' % (init_content, more_content)
120
121
        tree.commit(message='committed')
121
122
        self.build_tree_contents([('a_file', next_content)])
122
123
        self.run_bzr(['shelve', '--all'])
123
 
        out, err = self.run_bzr_raw(['unshelve', '--preview'], encoding='latin-1')
 
124
        out, err = self.run_bzr_raw(
 
125
            ['unshelve', '--preview'], encoding='latin-1')
124
126
 
125
127
        self.assertContainsString(out, diff_part)
126
128