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

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2020-06-12 01:45:56 UTC
  • mfrom: (7513.1.2 pypy3)
  • Revision ID: breezy.the.bot@gmail.com-20200612014556-tsc8assk3d0luziu
Avoid deprecated behaviour in ElementTree.

Merged from https://code.launchpad.net/~jelmer/brz/pypy3/+merge/385611

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_log.py
17
17
 
18
18
"""Black-box tests for brz log."""
19
19
 
20
 
from __future__ import absolute_import
21
 
 
22
20
 
23
21
import os
24
22
 
29
27
    osutils,
30
28
    tests,
31
29
    )
32
 
from breezy.sixish import PY3
33
30
from breezy.tests import (
34
31
    test_log,
35
32
    features,
36
33
    )
37
 
from breezy.tests.matchers import ContainsNoVfsCalls
 
34
from breezy.bzr.tests.matchers import ContainsNoVfsCalls
38
35
 
39
36
 
40
37
class TestLog(tests.TestCaseWithTransport, test_log.TestLogMixin):
785
782
            out, err = brz('log', encoding=encoding)
786
783
            if not fail:
787
784
                # Make sure we wrote mu as we expected it to exist
788
 
                if not PY3:
789
 
                    self.assertNotEqual(-1, out.find(encoded_msg))
790
 
                    out_unicode = out.decode(encoding)
791
 
                else:
792
 
                    out_unicode = out
793
 
                self.assertNotEqual(-1, out_unicode.find(self._message))
 
785
                self.assertNotEqual(-1, out.find(self._message))
794
786
            else:
795
787
                self.assertNotEqual(-1, out.find('Message with ?'))
796
788
        finally: