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

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-11-16 18:59:44 UTC
  • mfrom: (7143.15.15 more-cleanups)
  • Revision ID: breezy.the.bot@gmail.com-20181116185944-biefv1sub37qfybm
Sprinkle some PEP8iness.

Merged from https://code.launchpad.net/~jelmer/brz/more-cleanups/+merge/358611

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_non_ascii.py
44
44
        self.overrideAttr(osutils, '_cached_user_encoding', self.encoding)
45
45
        email = self.info['committer'] + ' <joe@foo.com>'
46
46
        if sys.version_info[0] == 2:
47
 
            self.overrideEnv('BRZ_EMAIL', email.encode(osutils.get_user_encoding()))
 
47
            self.overrideEnv('BRZ_EMAIL', email.encode(
 
48
                osutils.get_user_encoding()))
48
49
        else:
49
50
            self.overrideEnv('BRZ_EMAIL', email)
50
51
        self.create_base()
62
63
            encoding = osutils.get_user_encoding()
63
64
        try:
64
65
            out = self.run_bzr_raw(args, encoding=encoding,
65
 
                               retcode=retcode, working_dir=working_dir)[0]
 
66
                                   retcode=retcode, working_dir=working_dir)[0]
66
67
            return out.decode(encoding)
67
68
        except UnicodeError as e:
68
69
            if not fail:
148
149
 
149
150
        txt = self.run_bzr_decode('status', encoding='ascii')
150
151
        expected = u'modified:\n  %s\n' % (
151
 
                    self.info['filename'].encode('ascii', 'replace').decode('ascii'),)
 
152
            self.info['filename'].encode('ascii', 'replace').decode('ascii'),)
152
153
        self.assertEqual(expected, txt)
153
154
 
154
155
    def test_cat(self):
237
238
        txt = self.run_bzr_decode(['mv', fname1, fname2, dirname])
238
239
        self._check_OSX_can_roundtrip(self.info['filename'])
239
240
        self.assertEqual([u'%s => %s/%s' % (fname1, dirname, fname1),
240
 
                          u'%s => %s/%s' % (fname2, dirname, fname2)]
241
 
                         , txt.splitlines())
 
241
                          u'%s => %s/%s' % (fname2, dirname, fname2)], txt.splitlines())
242
242
 
243
243
        # The rename should still succeed
244
244
        newpath = u'%s/%s' % (dirname, fname2)
270
270
 
271
271
        expected = osutils.pathjoin(osutils.getcwd(), dirname1)
272
272
        self.assertEqual(u'Using saved parent location: %s/\n'
273
 
                'No revisions or tags to pull.\n' % (expected,), txt)
 
273
                         'No revisions or tags to pull.\n' % (expected,), txt)
274
274
 
275
275
        self.build_tree_contents(
276
276
            [(osutils.pathjoin(dirname1, 'a'), b'and yet more\n')])
310
310
                            encoding='ascii')
311
311
 
312
312
        self.run_bzr_decode(['push', '--verbose', '--create-prefix',
313
 
                            dirname + '4/' + dirname + '5'])
 
313
                             dirname + '4/' + dirname + '5'])
314
314
        self.run_bzr_decode(['push', '--verbose', '--create-prefix',
315
 
                            dirname + '6/' + dirname + '7'], encoding='ascii')
 
315
                             dirname + '6/' + dirname + '7'], encoding='ascii')
316
316
 
317
317
    def test_renames(self):
318
318
        fname = self.info['filename'] + '2'
348
348
            ('base/', ),
349
349
            (osutils.pathjoin('base', '%s/' % (dirname,)), )])
350
350
        self.wt.add('base')
351
 
        self.wt.add('base/'+dirname)
 
351
        self.wt.add('base/' + dirname)
352
352
        path = osutils.pathjoin('base', dirname, fname)
353
353
        self._check_OSX_can_roundtrip(self.info['filename'])
354
354
        self.wt.rename_one(fname, path)
386
386
        self.wt.remove(fname)
387
387
 
388
388
        txt = self.run_bzr_decode('deleted')
389
 
        self.assertEqual(fname+'\n', txt)
 
389
        self.assertEqual(fname + '\n', txt)
390
390
 
391
391
        txt = self.run_bzr_decode('deleted --show-ids')
392
392
        self.assertTrue(txt.startswith(fname))
402
402
 
403
403
        txt = self.run_bzr_decode('modified')
404
404
        self._check_OSX_can_roundtrip(self.info['filename'])
405
 
        self.assertEqual('"'+fname+'"'+'\n', txt)
 
405
        self.assertEqual('"' + fname + '"' + '\n', txt)
406
406
 
407
407
        self.run_bzr_decode('modified', encoding='ascii', fail=True)
408
408
 
412
412
        self.wt.add(fname)
413
413
 
414
414
        txt = self.run_bzr_decode('added')
415
 
        self.assertEqual('"'+fname+'"'+'\n', txt)
 
415
        self.assertEqual('"' + fname + '"' + '\n', txt)
416
416
 
417
417
        self.run_bzr_decode('added', encoding='ascii', fail=True)
418
418
 
424
424
        self.wt.controldir.sprout(url)
425
425
 
426
426
        txt = self.run_bzr_decode('root', working_dir=dirname)
427
 
        self.assertTrue(txt.endswith(dirname+'\n'))
 
427
        self.assertTrue(txt.endswith(dirname + '\n'))
428
428
 
429
429
        txt = self.run_bzr_decode('root', encoding='ascii', fail=True,
430
430
                                  working_dir=dirname)