/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/plugins/git/tests/test_blackbox.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-07-02 01:50:36 UTC
  • mfrom: (6973.13.15 python3-l)
  • Revision ID: breezy.the.bot@gmail.com-20180702015036-p7h30yemu44e4p01
Fix more tests on Python3.

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

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/git/tests/test_blackbox.py
295
295
        output, error = self.run_bzr(['log', 'gitr'], retcode=3)
296
296
        self.assertEqual(error, 'brz: ERROR: Further revision history missing.\n')
297
297
        self.assertEqual(output,
298
 
                '------------------------------------------------------------\n'
299
 
                'revision-id: git-v1:' + self.repo.head() + '\n'
300
 
                'git commit: ' + self.repo.head() + '\n'
301
 
                'committer: Somebody <user@example.com>\n'
302
 
                'timestamp: Mon 2018-05-14 20:36:05 +0000\n'
303
 
                'message:\n'
304
 
                '  message\n')
 
298
                b'------------------------------------------------------------\n'
 
299
                b'revision-id: git-v1:' + self.repo.head() + b'\n'
 
300
                b'git commit: ' + self.repo.head() + b'\n'
 
301
                b'committer: Somebody <user@example.com>\n'
 
302
                b'timestamp: Mon 2018-05-14 20:36:05 +0000\n'
 
303
                b'message:\n'
 
304
                b'  message\n')
305
305
 
306
306
    def test_version_info_rio(self):
307
307
        output, error = self.run_bzr(['version-info', '--rio', 'gitr'])
308
 
        self.assertEqual(error, '')
309
 
        self.assertNotIn('revno:', output)
 
308
        self.assertEqual(error, b'')
 
309
        self.assertNotIn(b'revno:', output)
310
310
 
311
311
    def test_version_info_python(self):
312
312
        output, error = self.run_bzr(['version-info', '--python', 'gitr'])
313
 
        self.assertEqual(error, '')
314
 
        self.assertNotIn('revno:', output)
 
313
        self.assertEqual(error, b'')
 
314
        self.assertNotIn(b'revno:', output)
315
315
 
316
316
    def test_version_info_custom_with_revno(self):
317
317
        output, error = self.run_bzr(
318
318
                ['version-info', '--custom',
319
319
                 '--template=VERSION_INFO r{revno})\n', 'gitr'], retcode=3)
320
 
        self.assertEqual(error, 'brz: ERROR: Variable {revno} is not available.\n')
321
 
        self.assertEqual(output, 'VERSION_INFO r')
 
320
        self.assertEqual(error, b'brz: ERROR: Variable {revno} is not available.\n')
 
321
        self.assertEqual(output, b'VERSION_INFO r')
322
322
 
323
323
    def test_version_info_custom_without_revno(self):
324
324
        output, error = self.run_bzr(
325
325
                ['version-info', '--custom', '--template=VERSION_INFO \n',
326
326
                 'gitr'])
327
 
        self.assertEqual(error, '')
328
 
        self.assertEqual(output, 'VERSION_INFO \n')
 
327
        self.assertEqual(error, b'')
 
328
        self.assertEqual(output, b'VERSION_INFO \n')