/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: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-07-25 03:06:42 UTC
  • mfrom: (7045.3.4 python3-r)
  • Revision ID: breezy.the.bot@gmail.com-20180725030642-oghhedvui3470wy6
Fix another ~500 tests on Python 3.

Merged from https://code.launchpad.net/~jelmer/brz/python3-r/+merge/350430

Show diffs side-by-side

added added

removed removed

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