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

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2020-02-14 03:16:54 UTC
  • mfrom: (7479.2.3 no-more-python2)
  • Revision ID: breezy.the.bot@gmail.com-20200214031654-bp1xtv2jr9nmhto3
Drop python2 support.

Merged from https://code.launchpad.net/~jelmer/brz/no-more-python2/+merge/378694

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_trace.py
19
19
"""Tests for trace library"""
20
20
 
21
21
import errno
 
22
from io import StringIO
22
23
import logging
23
24
import os
24
25
import re
30
31
    errors,
31
32
    trace,
32
33
    )
33
 
from ..sixish import (
34
 
    PY3,
35
 
    StringIO,
36
 
    )
37
34
from . import features, TestCaseInTempDir, TestCase, TestSkipped
38
35
from ..trace import (
39
36
    mutter, mutter_callsite, report_exception,
146
143
            raise errors.BzrCommandError(u'argument foo\xb5 does not exist')
147
144
        except errors.BzrCommandError:
148
145
            msg = _format_exception()
149
 
        if PY3:
150
 
            expected = 'brz: ERROR: argument foo\xb5 does not exist\n'
151
 
        else:
152
 
            # GZ 2017-06-10: Pretty bogus, should encode per the output stream
153
 
            expected = 'brz: ERROR: argument foo\xc2\xb5 does not exist\n'
 
146
        expected = 'brz: ERROR: argument foo\xb5 does not exist\n'
154
147
        self.assertEqual(msg, expected)
155
148
 
156
149
    def test_format_exception(self):
410
403
 
411
404
    def test_log_utf8_arg(self):
412
405
        logging.getLogger("brz").debug(b"%s", b"\xc2\xa7")
413
 
        if PY3:
414
 
            expected = u"   DEBUG  b'\\xc2\\xa7'\n"
415
 
        else:
416
 
            expected = u"   DEBUG  \xa7\n"
 
406
        expected = u"   DEBUG  b'\\xc2\\xa7'\n"
417
407
        self.assertEqual(expected, self.get_log())
418
408
 
419
409
    def test_log_bytes_msg(self):
426
416
    def test_log_bytes_arg(self):
427
417
        logging.getLogger("brz").debug(b"%s", b"\xa7")
428
418
        log = self.get_log()
429
 
        if PY3:
430
 
            self.assertEqual(u"   DEBUG  b'\\xa7'\n", self.get_log())
431
 
        else:
432
 
            self.assertContainsString(log, "UnicodeDecodeError: ")
433
 
            self.assertContainsRe(
434
 
                log,
435
 
                "Logging record unformattable: ?'%s' % \\(b?'\\\\xa7',\\)\n")
 
419
        self.assertEqual(u"   DEBUG  b'\\xa7'\n", self.get_log())
436
420
 
437
421
    def test_log_mixed_strings(self):
438
422
        logging.getLogger("brz").debug(u"%s", b"\xa7")
439
423
        log = self.get_log()
440
 
        if PY3:
441
 
            self.assertEqual(u"   DEBUG  b'\\xa7'\n", self.get_log())
442
 
        else:
443
 
            self.assertContainsString(log, "UnicodeDecodeError: ")
444
 
            self.assertContainsRe(
445
 
                log,
446
 
                "Logging record unformattable: u'%s' % \\('\\\\xa7',\\)\n")
 
424
        self.assertEqual(u"   DEBUG  b'\\xa7'\n", self.get_log())
447
425
 
448
426
    def test_log_repr_broken(self):
449
427
        class BadRepr(object):